Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
247,096 Commits 3 Branches 0 Tags
d24893ee71875bc480ef83993de463a6d3ed98cd
Commit Graph

64443 Commits

Author SHA1 Message Date
TreeHugger Robot
1aa27fccb7 Merge "Added api to delete cache files for a given user" into nyc-dev am: 0a6a6db 
am: 7b13098

* commit '7b13098b6299530348c836266d74369b0ff0b3d4':
  Added api to delete cache files for a given user

Change-Id: I4a2c3d4137e2f48bf3e57c3a54c0ed5e573ed66e
 2016-04-13 03:20:27 +00:00
Suprabh Shukla
7b13098b62 Merge "Added api to delete cache files for a given user" into nyc-dev 
am: 0a6a6db

* commit '0a6a6dbe9107a3e31d74293f853b46ae0e5b9e7b':
  Added api to delete cache files for a given user

Change-Id: If8bc5327e76680d3d30127b1129e7c4c36928421
 2016-04-13 03:17:24 +00:00
TreeHugger Robot
0a6a6dbe91 Merge "Added api to delete cache files for a given user" into nyc-dev 2016-04-13 03:13:49 +00:00
Jorim Jaggi
b82c55b38e Merge "Add shadow for minimized dock" into nyc-dev am: a5df489 
am: fae3f9c

* commit 'fae3f9c5e51bbcd2ab3eab49d4a7aaf06fe88a41':
  Add shadow for minimized dock

Change-Id: I4a41197c569635235ae254892db9a7272eb154a3
 2016-04-13 02:37:38 +00:00
Jorim Jaggi
fae3f9c5e5 Merge "Add shadow for minimized dock" into nyc-dev 
am: a5df489

* commit 'a5df489c9c56b1ac5b0f1acef07454ea438b5367':
  Add shadow for minimized dock

Change-Id: Iab5e97a8a5cb521aadf519359816ff2c48de7e71
 2016-04-13 02:33:39 +00:00
Jorim Jaggi
a5df489c9c Merge "Add shadow for minimized dock" into nyc-dev 2016-04-13 02:24:57 +00:00
Jorim Jaggi
2917dc4918 Add shadow for minimized dock 
Bug: 27972642
Change-Id: Ic4c8145f61694ff2bb0e237da1142093c6a4d965
 2016-04-12 19:17:24 -07:00
Paul Jensen
45dd59b0f1 Merge "If Internet probe is redirected, pass redirect destination to NetworkAgent." into nyc-dev am: 3e6a6fc 
am: 2c1f03a

* commit '2c1f03ade023a61428b7d9101bc10e4c88ae941a':
  If Internet probe is redirected, pass redirect destination to NetworkAgent.

Change-Id: I4c5f5cb8591d8729de9036a6c2aabacd4aba0f39
 2016-04-13 02:02:13 +00:00
TreeHugger Robot
d1e516f071 Merge "Fix broken actions with MessagingStyle" into nyc-dev am: 4ecc0ce 
am: 36feadc

* commit '36feadc46c7a25a6fffe07d3187803fd72b88b5e':
  Fix broken actions with MessagingStyle

Change-Id: I192757a1ca04ad32bcd0eb8fbac47e2a381b3f96
 2016-04-13 02:01:32 +00:00
TreeHugger Robot
b707e4623e Merge "Set label for links to resolver activities." into nyc-dev am: d1b8d6d 
am: d516393

* commit 'd5163938650510a3f77ee42ef448550d426380b2':
  Set label for links to resolver activities.

Change-Id: If2e6eced61f1521ead8e37999f97659731ce72fa
 2016-04-13 02:00:50 +00:00
Eino-Ville Talvala
552781c9c0 Merge "Camera/Surface: Update OutputConfiguration API" into nyc-dev am: 777c4e7 
am: d848ebb

* commit 'd848ebb7a5930a8ad6c93efd2b8b0ccf2116a664':
  Camera/Surface: Update OutputConfiguration API

Change-Id: I10d13c49771baea1968d79a5359deaaca1697e5d
 2016-04-13 02:00:38 +00:00
Jeff Sharkey
45630fc0d3 Merge "Fix broken javadoc." into nyc-dev am: cadfc77 
am: f58879a

* commit 'f58879ac196662ea39b91d44179b2a0e86a52c4d':
  Fix broken javadoc.

Change-Id: I55e96a9ee2c735a0ff2b1254520d843b4ca13eeb
 2016-04-13 01:59:58 +00:00
Paul Jensen
2c1f03ade0 Merge "If Internet probe is redirected, pass redirect destination to NetworkAgent." into nyc-dev 
am: 3e6a6fc

* commit '3e6a6fc60ea78994298ff38cfe7230faf24fe6b7':
  If Internet probe is redirected, pass redirect destination to NetworkAgent.

Change-Id: I4a88bca105b1fceb7dc823b8a26991235944d405
 2016-04-13 01:41:05 +00:00
Paul Jensen
3e6a6fc60e Merge "If Internet probe is redirected, pass redirect destination to NetworkAgent." into nyc-dev 2016-04-13 01:33:37 +00:00
Suprabh Shukla
78c9eb8947 Added api to delete cache files for a given user 
Added an api to delete application cache files for a specific user. This
allows settings to clear cache files for work profile apps as well.

Bug: b/25338468
Change-Id: I52d4944a7a03b6d63ad44dd6bb868aec62815eab
 2016-04-12 18:23:56 -07:00
Adrian Roos
36feadc46c Merge "Fix broken actions with MessagingStyle" into nyc-dev 
am: 4ecc0ce

* commit '4ecc0ce387195c44f5737d5b155c0dd1ea00add7':
  Fix broken actions with MessagingStyle

Change-Id: I9cdff69b8931564190217bc0bfe4396954c4efa5
 2016-04-13 01:02:18 +00:00
TreeHugger Robot
4ecc0ce387 Merge "Fix broken actions with MessagingStyle" into nyc-dev 2016-04-13 00:54:32 +00:00
Philip P. Moltmann
d516393865 Merge "Set label for links to resolver activities." into nyc-dev 
am: d1b8d6d

* commit 'd1b8d6d342d049e00d9a304c291c6c024aa3c0a0':
  Set label for links to resolver activities.

Change-Id: Iaf7e59bdca4a25b347661bed7b927b8100dcac96
 2016-04-13 00:17:54 +00:00
Eino-Ville Talvala
d848ebb7a5 Merge "Camera/Surface: Update OutputConfiguration API" into nyc-dev 
am: 777c4e7

* commit '777c4e764462ec43e29e0366bd1203f9be9e5ded':
  Camera/Surface: Update OutputConfiguration API

Change-Id: I68cbc5100ecb766f9018cbbc751ca456727c6909
 2016-04-13 00:12:48 +00:00
TreeHugger Robot
d1b8d6d342 Merge "Set label for links to resolver activities." into nyc-dev 2016-04-13 00:12:39 +00:00
Eino-Ville Talvala
777c4e7644 Merge "Camera/Surface: Update OutputConfiguration API" into nyc-dev 2016-04-13 00:08:09 +00:00
Jeff Sharkey
f58879ac19 Merge "Fix broken javadoc." into nyc-dev 
am: cadfc77

* commit 'cadfc77d0355ef57308ef1bf8bf43560d2b2e245':
  Fix broken javadoc.

Change-Id: I2ccd28ea9b50f8e7573e18565e665b2b82c1a410
 2016-04-12 23:42:24 +00:00
Jeff Sharkey
cadfc77d03 Merge "Fix broken javadoc." into nyc-dev 2016-04-12 23:37:38 +00:00
Makoto Onuki
a9a8d44cdc Merge "ShortcutManager: Address API review feedback." into nyc-dev am: 1d616f0 
am: 9d25ead

* commit '9d25ead98b6b09611fd95dfdd2b49ef5191ea030':
  ShortcutManager: Address API review feedback.

Change-Id: I663034ac1ae3bdb7b0757efae0396235784b8dce
 2016-04-12 23:07:29 +00:00
Makoto Onuki
9d25ead98b Merge "ShortcutManager: Address API review feedback." into nyc-dev 
am: 1d616f0

* commit '1d616f0d880d0a4109e811221f3c3ff2e016013b':
  ShortcutManager: Address API review feedback.

Change-Id: I83cf33d390ba695117b88b397667e378902f439e
 2016-04-12 22:52:26 +00:00
Philip P. Moltmann
f8173ca8ac Set label for links to resolver activities. 
Also: Add specific labels for capture-image-intent.

Fixes: 20134921
Change-Id: I3678def1089512a8340f19110645a03379c26cee
 2016-04-12 15:44:00 -07:00
Joe Onorato
5ae916e1ad Merge "Merge "Add some tests for procstats, and fix some bugs that the tests uncovered." into nyc-dev am: 5dc3c67" into nyc-dev-plus-aosp 
am: e111018

* commit 'e111018c1766b5708a85660ee5f52b7f2a64357d':
  Add some tests for procstats, and fix some bugs that the tests uncovered.

Change-Id: I3b4957a0f20767a44a5064b1276ccd34c49b26f8
 2016-04-12 22:42:11 +00:00
Chad Brubaker
cbbb714aaf Merge "Merge "Add implemention for isSameTrustConfiguration" into nyc-dev am: d92e5c3" into nyc-dev-plus-aosp 
am: 4cc9d9d

* commit '4cc9d9d5e89aab0b30e7397382d0404702e5a02f':
  Add implemention for isSameTrustConfiguration

Change-Id: I56e87c662673084e311b23abf898aba368d26f8c
 2016-04-12 22:42:06 +00:00
Alan Viverette
46d6ebd308 Merge "Merge "Include current selection mode in TimePicker event text" into nyc-dev am: 20f2b38" into nyc-dev-plus-aosp 
am: ae26493

* commit 'ae264935b1bd79f3f9b9eee6a5777d63bdad1941':
  Include current selection mode in TimePicker event text

Change-Id: I816ac36e2dfe184c55ce290ae2834841efbfa324
 2016-04-12 22:42:00 +00:00
Andreas Gampe
5286e8a704 Merge "Frameworks/base: Add no-thread marking to zygote am: 1ef8aef" into nyc-dev-plus-aosp 
am: 8d26f3c

* commit '8d26f3c0cdd4355a0caeafb6d13f233bc9aaf2ad':
  Frameworks/base: Add no-thread marking to zygote

Change-Id: Ied839af41c9d5087a55d2c13bb5c99872b8ca882
 2016-04-12 22:41:53 +00:00
Sunny Goyal
0a6fc940d7 Merge "Merge "Changing LauncherApps to resolve activity by component name" into nyc-dev am: 1fe7dfa" into nyc-dev-plus-aosp 
am: 411d2f9

* commit '411d2f97054a1265a117c2bcdf8f83683846d73b':
  Changing LauncherApps to resolve activity by component name

Change-Id: I9fc47dfb6e801ab30babc012ff82011c48ab57b5
 2016-04-12 22:41:37 +00:00
Felipe Leme
877d517b4f Merge "Merge "Make getStorageVolume(File file) public." into nyc-dev am: 93c442e" into nyc-dev-plus-aosp 
am: d5ce189

* commit 'd5ce189a6924245cc924a3289d4006cc48d2994b':
  Make getStorageVolume(File file) public.

Change-Id: I98f6fee2a1a0b8ad709bba0f554c79f61921df1c
 2016-04-12 22:41:12 +00:00
Adrian Roos
b801527604 Merge "Merge "Notification MessagingStyle: Add handset views" into nyc-dev am: 4db2f1f" into nyc-dev-plus-aosp 
am: 34f82ca

* commit '34f82ca7332d2a148329128d773c328f5f48c3bc':
  Notification MessagingStyle: Add handset views

Change-Id: I3ca2689bd7de8fe13e6eca22bd562f7269801306
 2016-04-12 22:40:41 +00:00
Shreyas Basarge
cd001c26da Merge "Merge "Documentation for flex field" into nyc-dev am: 997743d" into nyc-dev-plus-aosp 
am: cbdbaad

* commit 'cbdbaadde6f9aaf5bd2cc016d3b4b1c9a5e16210':
  Documentation for flex field

Change-Id: Ic1faf3e0ed1f529cd579f83f65b9358b161331d2
 2016-04-12 22:38:49 +00:00
Adam Powell
b0b4147f9d Merge "Merge "Dispatch View#onVisibilityAggregated to views becoming invisible" into nyc-dev am: c4bf6e4" into nyc-dev-plus-aosp 
am: e9b7a3c

* commit 'e9b7a3cd1f42a10d528c3a85eabf8739c16a884f':
  Dispatch View#onVisibilityAggregated to views becoming invisible

Change-Id: I2a514d9a37f196064d6f135a000cceac455af7b2
 2016-04-12 22:38:14 +00:00
Adam Lesinski
b9dcdccbce Merge "Merge "BatteryStats: Don\'t log BluetoothScanTimer when it doesn\'t exist" into nyc-dev am: daeee0b" into nyc-dev-plus-aosp 
am: e0bd3a0

* commit 'e0bd3a07ed46dc9570976eeaabe9d5031c35efb4':
  BatteryStats: Don't log BluetoothScanTimer when it doesn't exist

Change-Id: Id83ac464c1a744a4b2538f23908c72ffc453249d
 2016-04-12 22:37:39 +00:00
Chad Brubaker
694e960c86 Merge "Merge "Document when usesCleartextTraffic is ignored." into nyc-dev am: e341ddf" into nyc-dev-plus-aosp 
am: 82029af

* commit '82029afade6a8f74b0ddee2978218a1ac4bf8d98':
  Document when usesCleartextTraffic is ignored.

Change-Id: I4a0c329f41ef56113f4da0c3bc1662021e0a6bcd
 2016-04-12 22:35:27 +00:00
Makoto Onuki
1d616f0d88 Merge "ShortcutManager: Address API review feedback." into nyc-dev 2016-04-12 22:34:17 +00:00
Joe Onorato
f35f061c50 Merge "Add some tests for procstats, and fix some bugs that the tests uncovered." into nyc-dev 
am: 5dc3c67

* commit '5dc3c674a2635179d17e96af8fb248142e03b87e':
  Add some tests for procstats, and fix some bugs that the tests uncovered.

Change-Id: I53ee3334f58db4a0904370fc4f2f1b6b29365020
 2016-04-12 22:22:52 +00:00
Chad Brubaker
f62489edd9 Merge "Add implemention for isSameTrustConfiguration" into nyc-dev 
am: d92e5c3

* commit 'd92e5c314e1a3ffa0bc6daf43e4e9cec2521d217':
  Add implemention for isSameTrustConfiguration

Change-Id: Ic6552d34ce666cea087f40564d944c1249dcc687
 2016-04-12 22:22:50 +00:00
Alan Viverette
8042045fdf Merge "Include current selection mode in TimePicker event text" into nyc-dev 
am: 20f2b38

* commit '20f2b38ea4633446e9da23a86a29b40a59067af6':
  Include current selection mode in TimePicker event text

Change-Id: Ie06ee0564b207e4f83b8409d9d2174752fa3246f
 2016-04-12 22:22:47 +00:00
Andreas Gampe
0c322abb25 Frameworks/base: Add no-thread marking to zygote 
am: 1ef8aef

* commit '1ef8aef260c19236be023c429b41a46e7f5da8b0':
  Frameworks/base: Add no-thread marking to zygote

Change-Id: I8ac948e3c107324ce18e44bdff74fce1bd97fc6c
 2016-04-12 22:22:43 +00:00
Sunny Goyal
59c30a01af Merge "Changing LauncherApps to resolve activity by component name" into nyc-dev 
am: 1fe7dfa

* commit '1fe7dfa66aaf37045c62094438ab3db2ee5403c5':
  Changing LauncherApps to resolve activity by component name

Change-Id: I517285d5ca79af026080cc80e938e2134d98f14e
 2016-04-12 22:22:34 +00:00
Felipe Leme
db95b32d7d Merge "Make getStorageVolume(File file) public." into nyc-dev 
am: 93c442e

* commit '93c442e44f3aa6bd7a27ef74770aeeb2dfb4880d':
  Make getStorageVolume(File file) public.

Change-Id: Ib27ed0eb8538f997d01b1ef0541e5c6e5f181566
 2016-04-12 22:22:22 +00:00
Adrian Roos
28d6762456 Merge "Notification MessagingStyle: Add handset views" into nyc-dev 
am: 4db2f1f

* commit '4db2f1f6020a82012bcd3141a22bd59e0baed1d5':
  Notification MessagingStyle: Add handset views

Change-Id: Ib1971c6c1d8aa07ef586073bf2316f2b3b18bfab
 2016-04-12 22:22:15 +00:00
Shreyas Basarge
8a71af509a Merge "Documentation for flex field" into nyc-dev 
am: 997743d

* commit '997743d29e46ed034a0769e765a5ce83cd3f903a':
  Documentation for flex field

Change-Id: I6ef9763ec0c6e333ddae002e6dcf4a66d862464e
 2016-04-12 22:21:00 +00:00
Adam Powell
c3e096953d Merge "Dispatch View#onVisibilityAggregated to views becoming invisible" into nyc-dev 
am: c4bf6e4

* commit 'c4bf6e43d14ffe8d719227ddcc66e9b66dba005a':
  Dispatch View#onVisibilityAggregated to views becoming invisible

Change-Id: I2f97021a5bdc545b3c4cf516d93e5e4763eaec7d
 2016-04-12 22:20:50 +00:00
Adam Lesinski
e44263c1fe Merge "BatteryStats: Don\'t log BluetoothScanTimer when it doesn\'t exist" into nyc-dev 
am: daeee0b

* commit 'daeee0b5d70e2f97e7a8eebce181e092121b1809':
  BatteryStats: Don't log BluetoothScanTimer when it doesn't exist

Change-Id: I2497ab5496461933d37f75d5492bab151c240c7f
 2016-04-12 22:20:40 +00:00
Chad Brubaker
2ac28363f3 Merge "Document when usesCleartextTraffic is ignored." into nyc-dev 
am: e341ddf

* commit 'e341ddfa05e61d7ef937d6b3fd21a2bf4fa903fd':
  Document when usesCleartextTraffic is ignored.

Change-Id: I0e7534a0d58800704129a2f9a008347c471418df
 2016-04-12 22:19:47 +00:00
Adrian Roos
48d746ab32 Fix broken actions with MessagingStyle 
Bug: 27250207
Change-Id: I073bb0ef055423a6c152af0e98fe846b15511d11
 2016-04-12 15:00:31 -07:00