OSDN Git Service
Hugo Benichi [Fri, 29 Jul 2016 09:47:21 +0000 (09:47 +0000)]
Fix missing IpConnectivity metrics am:
90cbc5b444
am:
384818b99d
Change-Id: I62f174cc615f40e450ba72f8c6f86d46ed5fc096
Hugo Benichi [Fri, 29 Jul 2016 09:42:13 +0000 (09:42 +0000)]
Fix missing IpConnectivity metrics
am:
90cbc5b444
Change-Id: I636a187e94428f6974a3dc4e9588ea95f3293da8
Hugo Benichi [Fri, 29 Jul 2016 09:34:43 +0000 (09:34 +0000)]
Merge \\"IpConnectivityMetrics: no metrics upload in tests\\" into nyc-mr1-dev am:
1b4bd22f41
am:
6b104bdabf
Change-Id: Id587c460e906fe629eb64b39b4c18f902738d6d6
Hugo Benichi [Fri, 29 Jul 2016 09:34:35 +0000 (09:34 +0000)]
IpConnectivityMetrics: no metrics upload in tests am:
f9fdf87af2
am:
ae048d8363
Change-Id: I4171f72e27f39f2c10e4607b84934676337c1b4e
Hugo Benichi [Fri, 29 Jul 2016 09:28:19 +0000 (09:28 +0000)]
Merge \"IpConnectivityMetrics: no metrics upload in tests\" into nyc-mr1-dev
am:
1b4bd22f41
Change-Id: Ie313d530bcb5afd4e5ad9a6cf66c501b9029cbea
Hugo Benichi [Fri, 29 Jul 2016 09:28:17 +0000 (09:28 +0000)]
IpConnectivityMetrics: no metrics upload in tests
am:
f9fdf87af2
Change-Id: I3a7c39ccb185d1c10efcb1ddbfd2cddf7393b0a4
TreeHugger Robot [Fri, 29 Jul 2016 09:23:27 +0000 (09:23 +0000)]
Merge "IpConnectivityMetrics: no metrics upload in tests" into nyc-mr1-dev
Hugo Benichi [Fri, 29 Jul 2016 07:29:46 +0000 (16:29 +0900)]
Fix missing IpConnectivity metrics
The IpConnectivityLog class looks up MetricsLoggerService once only
at creation. If a IpConnectivityLog user instantiates this class too
early during the boot process, the MetricsLoggerService is not found
and no event can be recorded.
This patch makes IpConnectivityLog attempt to look up
MetricsLoggerService as long as it hasn't found it yet.
This allows IpManager and ConnectivityService to upload
android.net.metrics events.
Bug:
30490301
Change-Id: I97102b95a775ea9e90351b9887ae4661fddc2af9
Hugo Benichi [Thu, 28 Jul 2016 08:53:06 +0000 (17:53 +0900)]
IpConnectivityMetrics: no metrics upload in tests
Similarly to ApfTest, this patch changes ConnectivityServiceTest to use
a mock object instead of IpConnectivityLog so that running
ConnectivityServiceTest does not generate android.net.metrics events.
Bug:
30450301
Change-Id: Ibc0479f381f26e60baefbae15407c62aecbf6666
Winson [Fri, 29 Jul 2016 05:59:36 +0000 (05:59 +0000)]
Defaulting wallpaper offset to edge of the screen. am:
4b4ba90d66
am:
18faeaa5fa
Change-Id: I6f0ad64a07f10f81fd039e7da9556bb29156e1e1
Winson [Fri, 29 Jul 2016 05:54:33 +0000 (05:54 +0000)]
Defaulting wallpaper offset to edge of the screen.
am:
4b4ba90d66
Change-Id: I5b851e685637f564ec32dbef9e1437407cf3ea7f
Winson [Thu, 28 Jul 2016 02:45:52 +0000 (19:45 -0700)]
Defaulting wallpaper offset to edge of the screen.
- To match the AOSP launcher which no longer centers the default page,
we now align the wallpaper to either edge of the screen (depending on
RTL). This prevents a jump in the keyguard when starting the device
due to the wallpaper offset being initialized before Launcher is
started and can update the offset itself.
Bug:
28795125
Change-Id: Ica96a367157aef696b361601d346774960430fbf
David Friedman [Fri, 29 Jul 2016 03:47:16 +0000 (03:47 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am:
a211850784 am:
00f85a4794 am:
acbe40ef64
am:
c3ae3d1eb2
Change-Id: Ibfa25afe67d627c0ef9e5347ee3d9b2fc057eaf2
David Friedman [Fri, 29 Jul 2016 03:41:12 +0000 (03:41 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am:
a211850784 am:
00f85a4794
am:
acbe40ef64
Change-Id: Ic0bc264ee808f2533e959772164659bcf3381b77
David Friedman [Fri, 29 Jul 2016 03:41:08 +0000 (03:41 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am:
a211850784 am:
00f85a4794
am:
3cf674ee3a
Change-Id: I39b7edf2f1bec0f97ab9c7ca7797046d575fbd15
David Friedman [Fri, 29 Jul 2016 03:36:41 +0000 (03:36 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am:
a211850784
am:
00f85a4794
Change-Id: I7ed512a30d481d3dfbbce9038e18567388a72a0b
David Friedman [Fri, 29 Jul 2016 03:36:39 +0000 (03:36 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am:
a211850784
am:
00f85a4794
Change-Id: Ib2edb4aa67fadbd0cc535c1f587d8e567095d0d8
David Friedman [Fri, 29 Jul 2016 03:29:23 +0000 (03:29 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.
am:
a211850784
Change-Id: If4408cf7a44273320a7154c776f8385d445406dd
David Friedman [Fri, 29 Jul 2016 00:07:46 +0000 (17:07 -0700)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.
Bug:
30292533
Change-Id: Ifd9ca24804d96d0e50dd0f94a028233cc2cbca4e
(cherry picked from commit
4dd89b6d86c13f170c61ca425d22e0463a81224f)
Suprabh Shukla [Fri, 29 Jul 2016 01:24:21 +0000 (01:24 +0000)]
Merge \\"Ensuring KeyguardService has the correct user when it starts\\" into nyc-mr1-dev am:
81bd8d79cb
am:
0a51d0c8cf
Change-Id: I3d573a1088f18d3ac90e840d61b321b02b73c5be
Suprabh Shukla [Fri, 29 Jul 2016 01:24:18 +0000 (01:24 +0000)]
Ensuring KeyguardService has the correct user when it starts am:
323d2bbc34
am:
45540e5b26
Change-Id: I20062d6da668d83a6b4dee02283c5164aeb18d72
Adarsh Fernando [Fri, 29 Jul 2016 01:10:54 +0000 (01:10 +0000)]
Merge \\\"Docs: fix broken image link in platforms architecture doc\\\" into nyc-dev am:
eb73a791fd am:
d26ae56f9d
am:
7e78990f32
Change-Id: I070c6b0c61f3eba49cb833381ce758090460dbf1
Adarsh Fernando [Fri, 29 Jul 2016 01:10:50 +0000 (01:10 +0000)]
Docs: fix broken image link in platforms architecture doc am:
0ead099a87 am:
911d23165e
am:
5c38240a10
Change-Id: I5c33fc495ac890effeab0ee615bbadb2d49e8ab5
Suprabh Shukla [Fri, 29 Jul 2016 01:10:42 +0000 (01:10 +0000)]
Merge \"Ensuring KeyguardService has the correct user when it starts\" into nyc-mr1-dev
am:
81bd8d79cb
Change-Id: I1683f4bd8f3b4db867f1264d387c4a5c34c8a2ea
Suprabh Shukla [Fri, 29 Jul 2016 01:10:40 +0000 (01:10 +0000)]
Ensuring KeyguardService has the correct user when it starts
am:
323d2bbc34
Change-Id: I5bf0b68dc4def450c2e395ad619dd18104523c5e
Adarsh Fernando [Fri, 29 Jul 2016 01:05:00 +0000 (01:05 +0000)]
Merge \\"Docs: fix broken image link in platforms architecture doc\\" into nyc-dev am:
eb73a791fd
am:
d26ae56f9d
Change-Id: Ifca7baf59c65b27edafe02cd2e744244039ce8b5
Adarsh Fernando [Fri, 29 Jul 2016 01:04:58 +0000 (01:04 +0000)]
Docs: fix broken image link in platforms architecture doc am:
0ead099a87
am:
911d23165e
Change-Id: If4f6f7b713f68912db2261a137b8dd9a6ec538e6
Suprabh Shukla [Fri, 29 Jul 2016 01:04:28 +0000 (01:04 +0000)]
Merge "Ensuring KeyguardService has the correct user when it starts" into nyc-mr1-dev
Adarsh Fernando [Fri, 29 Jul 2016 00:55:00 +0000 (00:55 +0000)]
Merge \\"Docs: fix broken image link in platforms architecture doc\\" into nyc-dev am:
eb73a791fd
am:
6aa966b7e6
Change-Id: I021eff312603b206876358c6fbfd81bf1ababd80
Adarsh Fernando [Fri, 29 Jul 2016 00:54:57 +0000 (00:54 +0000)]
Docs: fix broken image link in platforms architecture doc am:
0ead099a87
am:
dca5dadaf0
Change-Id: I2b661cf488ecf420fe5c9e951dda523a66bc7126
Adarsh Fernando [Fri, 29 Jul 2016 00:54:13 +0000 (00:54 +0000)]
Merge \"Docs: fix broken image link in platforms architecture doc\" into nyc-dev
am:
eb73a791fd
Change-Id: I8869e542136224329f0a2d3335426d617fa4d95c
Adarsh Fernando [Fri, 29 Jul 2016 00:54:11 +0000 (00:54 +0000)]
Docs: fix broken image link in platforms architecture doc
am:
0ead099a87
Change-Id: I31f417f372c9b09b708eca2685e5927a2a128e7d
Adarsh Fernando [Fri, 29 Jul 2016 00:48:08 +0000 (00:48 +0000)]
Merge \"Docs: fix broken image link in platforms architecture doc\" into nyc-dev
am:
eb73a791fd
Change-Id: Id891f6acc4a270dfa8084423cdb5a28bcae3a3a8
Adarsh Fernando [Fri, 29 Jul 2016 00:48:05 +0000 (00:48 +0000)]
Docs: fix broken image link in platforms architecture doc
am:
0ead099a87
Change-Id: I394553e7feddf1335da921546e0ac711c9d94584
Adarsh Fernando [Fri, 29 Jul 2016 00:41:01 +0000 (00:41 +0000)]
Merge "Docs: fix broken image link in platforms architecture doc" into nyc-dev
David Friedman [Fri, 29 Jul 2016 00:34:30 +0000 (00:34 +0000)]
Merge \\\"Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.\\\" into nyc-dev am:
e67d1573eb am:
0f42315485
am:
5dc44a59fe
Change-Id: I8a7b33999c18f841c445cec98b2e70a943735351
David Friedman [Fri, 29 Jul 2016 00:34:25 +0000 (00:34 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am:
4dd89b6d86 am:
26c2bbca45
am:
507a07dd7b
Change-Id: I42cb337d97e2570a9c1e6c37e2d71eab03cb2be2
Dirk Dougherty [Fri, 29 Jul 2016 00:34:22 +0000 (00:34 +0000)]
Doc change: remove deprecated intl versions of notifications guidelines. am:
223a1727cc am:
8478151729 am:
aa308c94c9
am:
9a651a43c9
Change-Id: I48d0b12e68a689733a058a226f3140374289fd87
David Friedman [Fri, 29 Jul 2016 00:28:00 +0000 (00:28 +0000)]
Merge \\"Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.\\" into nyc-dev am:
e67d1573eb
am:
0f42315485
Change-Id: Ieb4457cd5e967dbb48b6e9666b42fc83889fd959
David Friedman [Fri, 29 Jul 2016 00:27:57 +0000 (00:27 +0000)]
Merge \\"Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.\\" into nyc-dev am:
e67d1573eb
am:
609ca92061
Change-Id: I5d849fdcb119adcf08fa476a896e0a567a6af8ea
David Friedman [Fri, 29 Jul 2016 00:27:54 +0000 (00:27 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am:
4dd89b6d86
am:
26c2bbca45
Change-Id: Ia878133e58b32ec220ff37f42e7abd00e3ff104d
David Friedman [Fri, 29 Jul 2016 00:27:52 +0000 (00:27 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am:
4dd89b6d86
am:
c1f941e10f
Change-Id: I966645804503179e070f9c27dc3d270b98ba6acc
Dirk Dougherty [Fri, 29 Jul 2016 00:27:48 +0000 (00:27 +0000)]
Doc change: remove deprecated intl versions of notifications guidelines. am:
223a1727cc am:
8478151729
am:
aa308c94c9
Change-Id: I2bfbd9d4200bea23056aff250353fc98acda02a0
Dirk Dougherty [Fri, 29 Jul 2016 00:22:31 +0000 (00:22 +0000)]
Doc change: remove deprecated intl versions of notifications guidelines. am:
223a1727cc am:
8478151729
am:
68883c7a8a
Change-Id: I83ba1d96c453fe4f18f2ad064f8a2f46b18d7b99
David Friedman [Fri, 29 Jul 2016 00:21:31 +0000 (00:21 +0000)]
Merge \"Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.\" into nyc-dev
am:
e67d1573eb
Change-Id: Ib4205f7720dcaca2f9ac2ed49b2cd06fdf397080
David Friedman [Fri, 29 Jul 2016 00:21:29 +0000 (00:21 +0000)]
Merge \"Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.\" into nyc-dev
am:
e67d1573eb
Change-Id: I704d1d09ba636783ba4f749d989f00e62456e903
David Friedman [Fri, 29 Jul 2016 00:21:29 +0000 (00:21 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.
am:
4dd89b6d86
Change-Id: I7490d787de713a597969e61f91eb8624a76947a4
David Friedman [Fri, 29 Jul 2016 00:21:26 +0000 (00:21 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.
am:
4dd89b6d86
Change-Id: I2efed8ab54d5dbeca8e8b25cac1dda93b39d5b77
Dirk Dougherty [Fri, 29 Jul 2016 00:21:25 +0000 (00:21 +0000)]
Doc change: remove deprecated intl versions of notifications guidelines. am:
223a1727cc
am:
8478151729
Change-Id: Iaca8e1e20c479684289ad9d5b4278976e1f5a180
Dirk Dougherty [Fri, 29 Jul 2016 00:15:59 +0000 (00:15 +0000)]
Doc change: remove deprecated intl versions of notifications guidelines. am:
223a1727cc
am:
8478151729
Change-Id: I01b7ab35e2b1fa864cb075f9ebf6bfea261d862b
David Friedman [Fri, 29 Jul 2016 00:12:15 +0000 (00:12 +0000)]
Merge "Docs: Adds a redirect to allow a shorter URL for NBU page on DAC." into nyc-dev
Dirk Dougherty [Fri, 29 Jul 2016 00:08:10 +0000 (00:08 +0000)]
Doc change: remove deprecated intl versions of notifications guidelines.
am:
223a1727cc
Change-Id: I3e10459cb9698ea9aa9a3739769fd31bbda25f83
David Friedman [Fri, 29 Jul 2016 00:07:46 +0000 (17:07 -0700)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.
Bug:
30292533
Change-Id: Ifd9ca24804d96d0e50dd0f94a028233cc2cbca4e
Doris Ling [Thu, 28 Jul 2016 23:44:55 +0000 (23:44 +0000)]
Merge \\"Default fingerprint swipe to disabled.\\" into nyc-mr1-dev am:
781f4386dc
am:
f7f4dfea71
Change-Id: Icd36956bddc4406551cdf2d8ebb626b3bfb6c6de
Doris Ling [Thu, 28 Jul 2016 23:44:15 +0000 (23:44 +0000)]
Default fingerprint swipe to disabled. am:
d01217c0c2
am:
fd8273d53d
Change-Id: Ic77ab241b6bd3d754d19ff38e14dafb4e8be9972
Doris Ling [Thu, 28 Jul 2016 23:36:57 +0000 (23:36 +0000)]
Merge \"Default fingerprint swipe to disabled.\" into nyc-mr1-dev
am:
781f4386dc
Change-Id: If81ae49da0f094dbf97421a3a921c654ce0c81eb
Doris Ling [Thu, 28 Jul 2016 23:36:19 +0000 (23:36 +0000)]
Default fingerprint swipe to disabled.
am:
d01217c0c2
Change-Id: Ic64af13a88e25e4d623195d4ee51f83733606345
Dirk Dougherty [Thu, 28 Jul 2016 23:24:12 +0000 (16:24 -0700)]
Doc change: remove deprecated intl versions of notifications guidelines.
Bug:
28768849
Change-Id: Id38ce9f9a26ff7b6e77a55baa7feb0b93aa58f82
Doris Ling [Thu, 28 Jul 2016 23:28:16 +0000 (23:28 +0000)]
Merge "Default fingerprint swipe to disabled." into nyc-mr1-dev
Suprabh Shukla [Thu, 28 Jul 2016 00:00:12 +0000 (17:00 -0700)]
Ensuring KeyguardService has the correct user when it starts
Because RetailDemoModeService was switching user before KeyguardService
was started, KeyguardViewMediator was missing the call to setCurrentUser
on user switch. Setting the current user from keyguardState in
onServiceConnected, if there was a user switch that happened earlier.
Also changed RetailDemoModeService to switch user after it receives boot
phase BOOT_COMPLETE.
Bug:
30038980
Change-Id: I142570529097199ccc50849297ae67ca49d35534
Todd Kennedy [Thu, 28 Jul 2016 22:49:49 +0000 (22:49 +0000)]
Merge \\"update shared libraries for system apps\\" into nyc-mr1-dev am:
6cecc8dc27
am:
a4bef226cc
Change-Id: I888c88308bf81ad5678b8049ba67142625c6e0b1
Todd Kennedy [Thu, 28 Jul 2016 22:49:45 +0000 (22:49 +0000)]
update shared libraries for system apps am:
6058df65e6
am:
9815fd3b2e
Change-Id: I5e90f56f97fca569bc740f57e750a8c196cbfd78
Todd Kennedy [Thu, 28 Jul 2016 22:14:53 +0000 (22:14 +0000)]
Merge \"update shared libraries for system apps\" into nyc-mr1-dev
am:
6cecc8dc27
Change-Id: I676c0cf9c4db0adf7dc8dcd89a7ec2023295a715
Todd Kennedy [Thu, 28 Jul 2016 22:14:51 +0000 (22:14 +0000)]
update shared libraries for system apps
am:
6058df65e6
Change-Id: Icb2199835353f9f71c98365c3baced91ecab063c
TreeHugger Robot [Thu, 28 Jul 2016 22:03:27 +0000 (22:03 +0000)]
Merge "update shared libraries for system apps" into nyc-mr1-dev
Fyodor Kupolov [Thu, 28 Jul 2016 22:03:08 +0000 (22:03 +0000)]
Merge \\"Set secure setting when all preloaded apps are installed\\" into nyc-mr1-dev am:
65e3c7420d
am:
649620349b
Change-Id: I756fe6fe4cc3273e6ed10c2a2a0057f8b079676d
Fyodor Kupolov [Thu, 28 Jul 2016 22:03:04 +0000 (22:03 +0000)]
Set secure setting when all preloaded apps are installed am:
51ce8ee3b1
am:
65d5e75895
Change-Id: I0413cdb3dd7139066712caab59a5593d866ac2a7
Adarsh Fernando [Thu, 28 Jul 2016 21:53:11 +0000 (14:53 -0700)]
Docs: fix broken image link in platforms architecture doc
Change-Id: Ie6a9f6c475633336b45cb74719c2cf0724e54971
Fyodor Kupolov [Thu, 28 Jul 2016 21:58:07 +0000 (21:58 +0000)]
Merge \"Set secure setting when all preloaded apps are installed\" into nyc-mr1-dev
am:
65e3c7420d
Change-Id: I1fdb434167f5031253bbb7a8f910c4b33c12e617
Fyodor Kupolov [Thu, 28 Jul 2016 21:58:05 +0000 (21:58 +0000)]
Set secure setting when all preloaded apps are installed
am:
51ce8ee3b1
Change-Id: I8f2f0f9c2f8db92231e5da100634bfebb8ae6455
TreeHugger Robot [Thu, 28 Jul 2016 21:53:01 +0000 (21:53 +0000)]
Merge "Set secure setting when all preloaded apps are installed" into nyc-mr1-dev
Makoto Onuki [Thu, 28 Jul 2016 21:42:34 +0000 (21:42 +0000)]
Merge \\"Relax isUserRunning check and allow in-profile calls\\" into nyc-mr1-dev am:
82c2e88890
am:
a09d617e05
Change-Id: I17d305e6195c5315497f412e76e6cda7d096eeb8
Makoto Onuki [Thu, 28 Jul 2016 21:42:31 +0000 (21:42 +0000)]
Relax isUserRunning check and allow in-profile calls am:
8198deacb5
am:
f29793a40c
Change-Id: I5d89b8fc1f440d3d466ac5900962a7519361c8e0
Makoto Onuki [Thu, 28 Jul 2016 21:38:19 +0000 (21:38 +0000)]
Merge \"Relax isUserRunning check and allow in-profile calls\" into nyc-mr1-dev
am:
82c2e88890
Change-Id: I8a5a49a623611b72c3d01669944c3d34f114517f
Makoto Onuki [Thu, 28 Jul 2016 21:38:14 +0000 (21:38 +0000)]
Relax isUserRunning check and allow in-profile calls
am:
8198deacb5
Change-Id: I55a2badbfd89f65f56bdd75daa15b81ec46c0cdd
Makoto Onuki [Thu, 28 Jul 2016 21:33:13 +0000 (21:33 +0000)]
Merge "Relax isUserRunning check and allow in-profile calls" into nyc-mr1-dev
Doris Ling [Thu, 28 Jul 2016 20:46:33 +0000 (13:46 -0700)]
Default fingerprint swipe to disabled.
If Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED is not set, default it
to 0 to diable fingerprint swipe.
Bug:
30416729
Change-Id: I292aa696216facc8eaefd1f4bd698f6e5708dc85
Todd Kennedy [Thu, 28 Jul 2016 20:28:16 +0000 (13:28 -0700)]
update shared libraries for system apps
After removing updates for a system package, we weren't updating its
shared libraries when we should have. Make it so.
NOTE: This didn't affect device boot because we update all of the
shared libraries for all system applications after scanning packages.
Bug:
30266503
Change-Id: I8edf4344228fb3e793e7648ea70a041cb5db6af6
Fyodor Kupolov [Thu, 28 Jul 2016 00:45:12 +0000 (17:45 -0700)]
Set secure setting when all preloaded apps are installed
Bug:
30280710
Change-Id: Id87b51c53b1e553a6ab0a257be93baf7d31b6fe5
John Reck [Thu, 28 Jul 2016 20:20:57 +0000 (20:20 +0000)]
Merge \\"Drop less aggressively\\" into nyc-mr1-dev am:
abf66de147
am:
755d3c319e
Change-Id: I7be620117a59fa2de534612e16f0aef547e1ef72
John Reck [Thu, 28 Jul 2016 20:20:52 +0000 (20:20 +0000)]
Drop less aggressively am:
a3d795a34a
am:
62ec371a9e
Change-Id: Ifd9329e071f9391c5a5ced79301aee5410eff6d4
Adam Lesinski [Thu, 28 Jul 2016 20:14:12 +0000 (20:14 +0000)]
Fix nesting of sample XML code in complex-resources doc am:
79a5b91d0d am:
d779894510 am:
3a45979ab0
am:
9c8423b4bb
Change-Id: I0f9f16f2f46931007bae32da35210ab1a736550b
Jorim Jaggi [Thu, 28 Jul 2016 20:14:03 +0000 (20:14 +0000)]
Merge \\"Follow up for I420bee8a11d430b1e52ded050536e56a85a48800\\" into nyc-mr1-dev am:
ca5310dd5f
am:
77a7fea6eb
Change-Id: Ic20520c0c688df7d739dcbd305bfaa889180155e
Jorim Jaggi [Thu, 28 Jul 2016 20:13:44 +0000 (20:13 +0000)]
Follow up for I420bee8a11d430b1e52ded050536e56a85a48800 am:
8d4f5f52a1
am:
ffb289c7b3
Change-Id: Ia0befac114b3e1f534c477300d5875c2c6f0e588
John Reck [Thu, 28 Jul 2016 20:10:56 +0000 (20:10 +0000)]
Merge \"Drop less aggressively\" into nyc-mr1-dev
am:
abf66de147
Change-Id: I1f61a994dfae404342b6dfaa85ccb6d4d8fc5c86
John Reck [Thu, 28 Jul 2016 20:10:52 +0000 (20:10 +0000)]
Drop less aggressively
am:
a3d795a34a
Change-Id: I8cb55e8778fd9f9b5e5486b69d1bae490b02f823
Makoto Onuki [Thu, 28 Jul 2016 20:10:42 +0000 (13:10 -0700)]
Relax isUserRunning check and allow in-profile calls
Bug
30475753
Change-Id: I739ee7e259f041f5e133edf048b6b54cb7a770db
Adam Lesinski [Thu, 28 Jul 2016 20:04:02 +0000 (20:04 +0000)]
Fix nesting of sample XML code in complex-resources doc am:
79a5b91d0d am:
d779894510
am:
3a45979ab0
Change-Id: I44fb7baf945f27c5153c822f7766ee527927b4ab
Jorim Jaggi [Thu, 28 Jul 2016 20:04:01 +0000 (20:04 +0000)]
Merge \"Follow up for I420bee8a11d430b1e52ded050536e56a85a48800\" into nyc-mr1-dev
am:
ca5310dd5f
Change-Id: I45ab5cb459532a9390771a607878df9af8a3671a
Jorim Jaggi [Thu, 28 Jul 2016 20:03:58 +0000 (20:03 +0000)]
Follow up for I420bee8a11d430b1e52ded050536e56a85a48800
am:
8d4f5f52a1
Change-Id: I9b5c7d18520d57c355f3c8ea76e2dfc0e6d6ff39
John Reck [Thu, 28 Jul 2016 19:59:12 +0000 (19:59 +0000)]
Merge "Drop less aggressively" into nyc-mr1-dev
Android Build Merger (Role) [Thu, 28 Jul 2016 19:51:09 +0000 (19:51 +0000)]
Merge "Fix nesting of sample XML code in complex-resources doc am:
79a5b91d0d am:
d779894510 am:
564a534f33" into nyc-mr1-dev-plus-aosp
Adam Lesinski [Thu, 28 Jul 2016 19:50:48 +0000 (19:50 +0000)]
Fix nesting of sample XML code in complex-resources doc am:
79a5b91d0d am:
d779894510
am:
564a534f33
Change-Id: I2f71941aec5a3a2998039aae8c94154cba1e63b7
Anthony Hugh [Thu, 28 Jul 2016 19:50:25 +0000 (19:50 +0000)]
Merge \"Update Priority Only defaults on Watch to not include Repeat Callers\" into cw-f-dev
am:
513d3e7073
Change-Id: I0ff3080f3ad84a8f649cd7477465adfd5ba7ff42
Anthony Hugh [Thu, 28 Jul 2016 19:50:21 +0000 (19:50 +0000)]
Update Priority Only defaults on Watch to not include Repeat Callers
am:
c04e68f0a5
Change-Id: Iaee9ad9a0ea2ec1557e69d567a094a144244d8f8
Adam Lesinski [Thu, 28 Jul 2016 19:45:41 +0000 (19:45 +0000)]
Merge \\"DO NOT MERGE Change KernelUidCpuTimeReader Slog.wtf to Slog.e\\" into nyc-mr1-dev am:
533159b4f9
am:
e65da1061f
Change-Id: I19d48e089bf61d4d438b8d64d984467e775c635e
Adam Lesinski [Thu, 28 Jul 2016 19:42:11 +0000 (19:42 +0000)]
Fix nesting of sample XML code in complex-resources doc am:
79a5b91d0d
am:
d779894510
Change-Id: I1c747c97fe2a3474c97f5ca97706d9c25e1ea28d
Adam Lesinski [Thu, 28 Jul 2016 19:40:59 +0000 (19:40 +0000)]
DO NOT MERGE Change KernelUidCpuTimeReader Slog.wtf to Slog.e am:
82a4d6f93b
am:
52d7fd62a4
Change-Id: I3b5febe3ecbd2ebead013273f5fe867376e2b756
Adam Lesinski [Thu, 28 Jul 2016 19:40:44 +0000 (19:40 +0000)]
Merge \\"Fix nesting of sample XML code in complex-resources doc\\" into nyc-mr1-dev am:
c8c98ce254
am:
d70b8aa35e
Change-Id: I85c43c7e9ce1160e19762e5cafe297d389ec5ecc
TreeHugger Robot [Thu, 28 Jul 2016 19:38:31 +0000 (19:38 +0000)]
Merge "Update Priority Only defaults on Watch to not include Repeat Callers" into cw-f-dev
OSDN Git Service
