Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,895 Commits 3 Branches 0 Tags
87f3aeeee2a9859cd312c3f1d8a18946cf8f582b
Commit Graph

256895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
de84a27872 Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs am: 0a957d5aa2 am: b33f36497d 
am: a4101e6693

* commit 'a4101e66933fd5acb882bfc0311f3f4b5cbd5b11':
  Update default image for n preview docs. Update tools resources.

Change-Id: I859659905ab0bdd7e16a2406542c0cac69e1f4d7
 2016-05-16 22:41:55 +00:00
smain@google.com
1d145e7d2b Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs am: a0acf474e9 am: 592b36a326 
am: 0b019a3d02

* commit '0b019a3d028990a9832188d3ef2c9540e5d37f40':
  Avoid weird line wrapping by removing columns and forcing line breaks between the links

Change-Id: Ifba667194d2e2f04a9824945d5100cdea01a9c77
 2016-05-16 22:41:44 +00:00
Jorim Jaggi
54d47c8e1e Merge "Fix transition delay tracking when starting activity from recents" into nyc-dev am: 8e30eb3a7f 
am: 87072fed10

* commit '87072fed1073fdd97e61a3a6eb64cacd937cc866':

Change-Id: I89b1718a2a42c9e91bfd02a98bf23fb87762c316
 2016-05-16 22:40:04 +00:00
Dianne Hackborn
3f46ecb2ba Merge "Fix issue #28794831: meminfo considers cached processes to be services" into nyc-dev am: 0cb1cc74b8 
am: c5d784caf3

* commit 'c5d784caf358621823acab85c1d19840571a7556':

Change-Id: Iaa2c436d7c094d63f7a1f503c44d18d56c5e26cf
 2016-05-16 22:40:00 +00:00
Jaewan Kim
174aa3346c Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev 2016-05-16 22:38:23 +00:00
Michael Kwan
cc6e6f0e0a Modified AlertController to allow themes to specify custom implementation. 
Bug: 17733928
Change-Id: I0264ee8ceee09dbc33da61365c424c74d2e3c3d6
 2016-05-16 15:36:22 -07:00
Dirk Dougherty
a4101e6693 Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs am: 0a957d5aa2 
am: b33f36497d

* commit 'b33f36497dbc7265ee16323ee6c0281690ca3221':
  Update default image for n preview docs. Update tools resources.

Change-Id: I1ed7ac4ecf30538252d4b277b1baf93ec61e4835
 2016-05-16 22:35:33 +00:00
Jorim Jaggi
2cdaa75f9b Merge "Fix transition delay tracking when starting activity from recents" into nyc-dev am: 8e30eb3a7f 
am: 6f269ae2e5

* commit '6f269ae2e5d6d3369c908f3958c92c689e585f88':
  Fix transition delay tracking when starting activity from recents

Change-Id: I94d0fc08d8ba38b1bf9c28b0dfb72b45d6178267
 2016-05-16 22:35:31 +00:00
Scott Main
0b019a3d02 Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs am: a0acf474e9 
am: 592b36a326

* commit '592b36a326216cd2442c47da9608ca2afd7e4d16':
  Avoid weird line wrapping by removing columns and forcing line breaks between the links

Change-Id: I54b1282f6ef2d92251a4624c8f439499831af1a6
 2016-05-16 22:35:30 +00:00
Dianne Hackborn
fb6e3c6b82 Merge "Fix issue #28794831: meminfo considers cached processes to be services" into nyc-dev am: 0cb1cc74b8 
am: 8a434c8052

* commit '8a434c805231d39a7dd23463f653e2cf565f65ec':
  Fix issue #28794831: meminfo considers cached processes to be services

Change-Id: Ic1886f671c4efb4cafcf71d903f9b168db6d395c
 2016-05-16 22:35:28 +00:00
Svetoslav Ganov
a8bbd76d9b Ensure app op restrictions reset when the app that set them dies. 
We were not keeping track when an app that set an app op restriction
dies to clean up after that. As a result we may end up with stale
restrictions that will be there until the device reoots - not cool.
This change adds remote binder death tracking and simplifies the
code as adding the formed would have made more complex.

bug:28770536

Change-Id: I7dcaafba2354843a0cdf0206ab1f96625edc5120
 2016-05-16 15:34:34 -07:00
Billy Lamberta
0f4c1a6120 Merge "docs: work minisite" into mnc-io-docs am: 8f740bea13 am: 51ceb1bad1 am: a0a34f6017 
am: 031929076e

* commit '031929076e917b11179a6e8c5eef5e292e84fb6d':

Change-Id: I64ec3689fc469dbbf0e3a262da19d9cc7980a819
 2016-05-16 22:32:09 +00:00
Jorim Jaggi
6f269ae2e5 Merge "Fix transition delay tracking when starting activity from recents" into nyc-dev 
am: 8e30eb3a7f

* commit '8e30eb3a7f81729065bad6d971bf414f995410df':
  Fix transition delay tracking when starting activity from recents

Change-Id: I95a27eef2544b5b05bd284a7c2b123e9986c3721
 2016-05-16 22:32:02 +00:00
Felipe Leme
ad41a42625 Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev am: 522787f39a 
am: d028ec4e29

* commit 'd028ec4e29a651b79a5876e3e686dd2f27c3b463':

Change-Id: I36a7ab1160f873a53eb427f4e54e658dd30d336d
 2016-05-16 22:32:02 +00:00
Dianne Hackborn
8a434c8052 Merge "Fix issue #28794831: meminfo considers cached processes to be services" into nyc-dev 
am: 0cb1cc74b8

* commit '0cb1cc74b851f995110b8231f754c9f84122c816':
  Fix issue #28794831: meminfo considers cached processes to be services

Change-Id: I8308866f956dc68f77f63dd48aa8335e5a3c8fff
 2016-05-16 22:31:49 +00:00
Michael Kwan
c995c6329a Merge "Allow ANR dialogs for Watch eng builds." into nyc-mr1-dev 
am: 0092f82d4c

* commit '0092f82d4c9e439d6930dcd1a7ac42987faf865a':
  Allow ANR dialogs for Watch eng builds.

Change-Id: I3182845d80bacb426363b9245ee49390846d9c15
 2016-05-16 22:31:41 +00:00
Jorim Jaggi
87072fed10 Merge "Fix transition delay tracking when starting activity from recents" into nyc-dev 
am: 8e30eb3a7f

* commit '8e30eb3a7f81729065bad6d971bf414f995410df':
  Fix transition delay tracking when starting activity from recents

Change-Id: I1b0a85c1fe5ce607e7bb46da03d27f77abe498db
 2016-05-16 22:31:32 +00:00
Dirk Dougherty
b33f36497d Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs 
am: 0a957d5aa2

* commit '0a957d5aa28920f8854070676955f941e3ae6726':
  Update default image for n preview docs. Update tools resources.

Change-Id: I3fa206d3bfc74d20cb74e19f0d084d62fb47c0e2
 2016-05-16 22:31:30 +00:00
Dianne Hackborn
c5d784caf3 Merge "Fix issue #28794831: meminfo considers cached processes to be services" into nyc-dev 
am: 0cb1cc74b8

* commit '0cb1cc74b851f995110b8231f754c9f84122c816':
  Fix issue #28794831: meminfo considers cached processes to be services

Change-Id: I2d9ab20344f982e97d91422e89e56a27420233bd
 2016-05-16 22:31:25 +00:00
smain@google.com
592b36a326 Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs 
am: a0acf474e9

* commit 'a0acf474e9db6e1a444d7e48b520b48ded8fcdce':
  Avoid weird line wrapping by removing columns and forcing line breaks between the links

Change-Id: I337e5167eb9191f674c6cc397d61925c334c3b72
 2016-05-16 22:31:22 +00:00
Billy Lamberta
47ad72994e Merge "docs: work minisite" into mnc-io-docs am: 8f740bea13 am: 51ceb1bad1 am: a0a34f6017 
am: 3744fda0f3

* commit '3744fda0f365a4337628c729394461e584b068fb':
  docs: work minisite

Change-Id: Iba7643eab1576ec2fb2e36dabac3e932bc37eaab
 2016-05-16 22:28:33 +00:00
Felipe Leme
00463970fe Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev am: 522787f39a 
am: b811d4ede8

* commit 'b811d4ede8ca91d1118ccb44a290c0707a984c09':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: Id6197b9ee56fd06505c21c1bb5dce083998aa79a
 2016-05-16 22:28:27 +00:00
Baligh Uddin
a7415866b8 Import translations. DO NOT MERGE 
Change-Id: I4da401d240a0092eab168724856107dc1e75036a
Auto-generated-cl: translation import
 2016-05-16 15:27:50 -07:00
Dirk Dougherty
0a957d5aa2 Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs 2016-05-16 22:27:48 +00:00
TreeHugger Robot
8e30eb3a7f Merge "Fix transition delay tracking when starting activity from recents" into nyc-dev 2016-05-16 22:27:39 +00:00
Dianne Hackborn
0cb1cc74b8 Merge "Fix issue #28794831: meminfo considers cached processes to be services" into nyc-dev 2016-05-16 22:26:13 +00:00
Scott Main
a0acf474e9 Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs 2016-05-16 22:25:51 +00:00
Billy Lamberta
031929076e Merge "docs: work minisite" into mnc-io-docs am: 8f740bea13 am: 51ceb1bad1 
am: a0a34f6017

* commit 'a0a34f6017287d466e90a27f82ff8cf4c91c0663':
  docs: work minisite

Change-Id: I2152083326c271ebd9adc5eea7a072db9b7aa080
 2016-05-16 22:23:55 +00:00
Billy Lamberta
3744fda0f3 Merge "docs: work minisite" into mnc-io-docs am: 8f740bea13 am: 51ceb1bad1 
am: a0a34f6017

* commit 'a0a34f6017287d466e90a27f82ff8cf4c91c0663':
  docs: work minisite

Change-Id: I5ad946e6c2786436785f83626e095408b795f826
 2016-05-16 22:23:55 +00:00
Felipe Leme
d028ec4e29 Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev 
am: 522787f39a

* commit '522787f39a759cf8af8438641fa8df7470a1b959':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: I1187ffeeb42b61329674ca022735efa08c7e9d98
 2016-05-16 22:23:46 +00:00
Felipe Leme
b811d4ede8 Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev 
am: 522787f39a

* commit '522787f39a759cf8af8438641fa8df7470a1b959':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: Ie2e7b14ecc0b574a8776121d3c79c768093ef4f7
 2016-05-16 22:23:44 +00:00
smain@google.com
d078d20ac6 Avoid weird line wrapping by removing columns and forcing line breaks between the links 
Change-Id: I797b46d75643ce2491d47c95599164022ce451a7
 2016-05-16 15:22:17 -07:00
Baligh Uddin
a3b6b364c6 Import translations. DO NOT MERGE 
Change-Id: Ic96958132725f1af9e842dbab5158628e51dea73
Auto-generated-cl: translation import
 2016-05-16 15:22:14 -07:00
Michael Kwan
0092f82d4c Merge "Allow ANR dialogs for Watch eng builds." into nyc-mr1-dev 2016-05-16 22:21:30 +00:00
Billy Lamberta
a0a34f6017 Merge "docs: work minisite" into mnc-io-docs am: 8f740bea13 
am: 51ceb1bad1

* commit '51ceb1bad18c39a5281fc2cbd6d9c234c2e7f14a':
  docs: work minisite

Change-Id: Ieac1a9a571bfe6ef94663623f5715d1b205dd242
 2016-05-16 22:19:41 +00:00
Baligh Uddin
0c931d6f80 Import translations. DO NOT MERGE 
Change-Id: If114c25440347c1fb96059eb7531dac999d88fcc
Auto-generated-cl: translation import
 2016-05-16 15:19:18 -07:00
Amith Yamasani
bf12565276 Allow Shell to change component enabled state 
But make sure that we don't allow Shell or other apps
to disable an active profile or device owner.

Also limit exactly what states Shell can switch apps
between, similar to Settings UI.

This is required for some CTS tests

Bug: 27924655
Change-Id: I958f0d1de7f0bc1f5a0cbf853d57dfdeb2f9ad59
 2016-05-16 15:17:50 -07:00
TreeHugger Robot
522787f39a Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev 2016-05-16 22:17:42 +00:00
Baligh Uddin
474bbe75c6 Import translations. DO NOT MERGE 
Change-Id: Ie2093912a314d30d88818d983c34d77925ec7051
Auto-generated-cl: translation import
 2016-05-16 15:13:35 -07:00
Android Build Merger (Role)
5fa0ec55f8 Merge "Merge "Adjust PrintRecommendationService for Konica Minolta." into nyc-dev am: 5bfaa9c128 am: 57b364eee7" into nyc-mr1-dev-plus-aosp 2016-05-16 22:13:29 +00:00
Android Build Merger (Role)
11387774a7 Merge "Merge "Delay grantDefaultPermissions until user\'s first start" into nyc-dev am: 6eb923cb64 am: 88fe6bc720" into nyc-mr1-dev-plus-aosp 2016-05-16 22:13:19 +00:00
Philip P. Moltmann
930fee6420 Merge "Adjust PrintRecommendationService for Konica Minolta." into nyc-dev am: 5bfaa9c128 
am: 57b364eee7

* commit '57b364eee7dfab340494fa70048ffce8ad81e359':
  Adjust PrintRecommendationService for Konica Minolta.

Change-Id: Id80c0e5458848ea2e98d64a775e0707d6ebadea4
 2016-05-16 22:12:53 +00:00
Fyodor Kupolov
8df2c398d1 Merge "Delay grantDefaultPermissions until user\'s first start" into nyc-dev am: 6eb923cb64 
am: 88fe6bc720

* commit '88fe6bc720eea128286d621f49c52e62330f14ed':
  Delay grantDefaultPermissions until user's first start

Change-Id: I1b89f25e70d4d205296da92bcd76c21bc8adefea
 2016-05-16 22:12:50 +00:00
Philip P. Moltmann
46bfa682cd Merge "Adjust PrintRecommendationService for Konica Minolta." into nyc-dev am: 5bfaa9c128 
am: 6c8767fea9

* commit '6c8767fea9495547a3468f783d0be048d57c7fa3':
  Adjust PrintRecommendationService for Konica Minolta.

Change-Id: I98399def3480297c76e0c0834b3671d3f172cf34
 2016-05-16 22:12:39 +00:00
Billy Lamberta
51ceb1bad1 Merge "docs: work minisite" into mnc-io-docs 
am: 8f740bea13

* commit '8f740bea131ca0234fee9dce273f23c6f21ddf2f':
  docs: work minisite

Change-Id: Id0a4c1be427a131f1766f3452bca1b2f90365981
 2016-05-16 22:12:37 +00:00
Fyodor Kupolov
6dbcb509df Merge "Delay grantDefaultPermissions until user\'s first start" into nyc-dev am: 6eb923cb64 
am: 89033ea614

* commit '89033ea614fe70730172749b6444f78705b66fad':
  Delay grantDefaultPermissions until user's first start

Change-Id: Ic57a83d54fef35ecc3b9f4a41008d07877a1b814
 2016-05-16 22:12:35 +00:00
Baligh Uddin
0e00b517e2 Import translations. DO NOT MERGE 
Change-Id: Iee59140458a863dd1d258b9281c7463c6af31b1e
Auto-generated-cl: translation import
 2016-05-16 15:10:33 -07:00
Philip P. Moltmann
57b364eee7 Merge "Adjust PrintRecommendationService for Konica Minolta." into nyc-dev 
am: 5bfaa9c128

* commit '5bfaa9c1283e05567cd88d35f13ae6872dd687e2':
  Adjust PrintRecommendationService for Konica Minolta.

Change-Id: Ia8c372413c14ad947341546c375123f2c09634ef
 2016-05-16 22:09:38 +00:00
Philip P. Moltmann
a99408caca Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev am: 11e215bc45 
am: 4012f08b73

* commit '4012f08b736538640d363c3ddcdaee35790f33c0':

Change-Id: I4dfbb6298d7959ad941d749db49f24bb2a130cf0
 2016-05-16 22:09:34 +00:00
Philip P. Moltmann
6c8767fea9 Merge "Adjust PrintRecommendationService for Konica Minolta." into nyc-dev 
am: 5bfaa9c128

* commit '5bfaa9c1283e05567cd88d35f13ae6872dd687e2':
  Adjust PrintRecommendationService for Konica Minolta.

Change-Id: Icd5edb72267ac24f700a9b171f97455f6319b74a
 2016-05-16 22:09:32 +00:00