Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
ff2067f9dc Merge "Merge "Fix usermanager related tests." into nyc-mr1-dev am: bb883ddf59" into nyc-mr1-dev-plus-aosp 2016-05-24 23:04:01 +00:00
Junda Liu
a2f6a67511 Add restricted card state to telephony manager. 
Bug: b/28564314
Change-Id: If19b12036b09a8cd015dce4faf5de26606ee2b97
 2016-05-24 16:03:37 -07:00
Sudheer Shanka
624e5d7c4c Merge "Fix usermanager related tests." into nyc-mr1-dev 
am: bb883ddf59

* commit 'bb883ddf59420377007b1daa1c6e0c07fb8d5eb4':
  Fix usermanager related tests.

Change-Id: Ie93d691bd34ec2457472661e03e8982fd7c5e32c
 2016-05-24 23:03:35 +00:00
Sid Soundararajan
8ddc4c5d85 Merge "Add support for dismissing in Talkback Mode" into nyc-dev am: a3cb77a9b4 am: cec78d078c 
am: e6f987f654

* commit 'e6f987f65441bba6ddae3a63d6e96273fb8aaef2':
  Add support for dismissing in Talkback Mode

Change-Id: I566e3b0c4c4d001ab1337675d28aa85b49b5745f
 2016-05-24 23:03:16 +00:00
Sid Soundararajan
438d5cfae4 Merge "Add support for dismissing in Talkback Mode" into nyc-dev am: a3cb77a9b4 
am: 4771bc84d8

* commit '4771bc84d8d5549925f026307c86abd5a9e64cf5':

Change-Id: I94073cfc228646e2c373f944109f4c56a1f326c5
 2016-05-24 23:02:38 +00:00
Sid Soundararajan
e6f987f654 Merge "Add support for dismissing in Talkback Mode" into nyc-dev am: a3cb77a9b4 
am: cec78d078c

* commit 'cec78d078c2440f619e72d03c258fd27a0823dca':
  Add support for dismissing in Talkback Mode

Change-Id: I74d0d4d76eefb729bf55132123b1d2a5a5f3ddf5
 2016-05-24 22:59:38 +00:00
Pavlin Radoslavov
e957a8a0b4 Add missing "try ... finally" safeguards 
Safeguards for code protected by ReentrantReadWriteLock.

Bug: 28734075
Bug: 28799467
Change-Id: Ib7f598a92e8df6bd855ca48cdd094c1c73a935f2
 2016-05-24 22:57:14 +00:00
TreeHugger Robot
bb883ddf59 Merge "Fix usermanager related tests." into nyc-mr1-dev 2016-05-24 22:55:40 +00:00
Sid Soundararajan
4771bc84d8 Merge "Add support for dismissing in Talkback Mode" into nyc-dev 
am: a3cb77a9b4

* commit 'a3cb77a9b451b1c02e668024a6a8e3b779a7781d':
  Add support for dismissing in Talkback Mode

Change-Id: I0bd9c14ce2c9537df981688eaa87f277cf72a5f3
 2016-05-24 22:53:05 +00:00
Sid Soundararajan
cec78d078c Merge "Add support for dismissing in Talkback Mode" into nyc-dev 
am: a3cb77a9b4

* commit 'a3cb77a9b451b1c02e668024a6a8e3b779a7781d':
  Add support for dismissing in Talkback Mode

Change-Id: I634ee39848e5392c2a38be41e17aa36932329e88
 2016-05-24 22:52:52 +00:00
Sid Soundararajan
a3cb77a9b4 Merge "Add support for dismissing in Talkback Mode" into nyc-dev 2016-05-24 22:46:27 +00:00
Dianne Hackborn
a8e6f875bc Fix issue #28931042: wtf in system server 
More broadcasts (from telephony) that should be protected.

Also put a little more information in the wtf message to
help determine where broadcasts from out of the system process
are coming from.

Change-Id: Ie3df25c883482ca54c7a7c5db57ca609950f5cbc
 2016-05-24 15:35:27 -07:00
Andrew Sapperstein
2522b1f138 Replace bluetooth pngs with vector drawables. 
The current pngs are hardcoded to the green accent color.
Instead, the new vector drawable replacements have colorAccent
set as a tint.

Saves a bit on APK size, especially since ic_bt_cellphone
can be auto-mirrored rather than requiring ldrtl variants.

BUG: 28760785
Change-Id: Ifaec204ad28dd6cbd8463388080583bf7cf62044
 2016-05-24 15:32:12 -07:00
Ta-wei Yen
67ab168b78 Switch VVM SMS filter to Builder pattern 
Bug:27816386
Change-Id: I74c73f0a43530dc563df29f0df7ae1a40845e8f0
 2016-05-24 15:25:16 -07:00
Aurimas Liutikas
514c5ef8d5 Add missing @Deprecated annotations. 
Add missing @Deprecated annotations for methods with @deprecated tag
in javadoc.

Change-Id: I35b78ccb97832d86b914c21a300444ba29e33844
 2016-05-24 15:22:55 -07:00
Jim Miller
f950ec9b1a Merge "Fix missing permission check when saving pattern/password" into mnc-dev am: 45c77d951a am: 9bf8474c27 
am: 89e3f2ba98

* commit '89e3f2ba98ea6d69b1846e996c4c279a9b20c4e9':
  Fix missing permission check when saving pattern/password

Change-Id: Ice157c9ee86cf29380766d3ec266cb57594a5868
 2016-05-24 22:20:09 +00:00
Jim Miller
89e3f2ba98 Merge "Fix missing permission check when saving pattern/password" into mnc-dev am: 45c77d951a 
am: 9bf8474c27

* commit '9bf8474c27642f48aa27e2edf1bdd83b27d692c1':
  Fix missing permission check when saving pattern/password

Change-Id: I4238a43dc30be54375b6db129b360cc7d0a90b0e
 2016-05-24 22:14:24 +00:00
Johan Torås Halseth
f9d7e99834 Merge "Adding grantPermission for packageName" into nyc-mr1-dev am: b1f0e9705d 
am: df296a7e68

* commit 'df296a7e68d1de4817d5176466e244b06b39a285':
  Adding grantPermission for packageName

Change-Id: Ibaa0ab46b56d1de9a0aa1a56b8e4c780239dae26
 2016-05-24 22:13:56 +00:00
Baligh Uddin
00328ab5cf Import translations. DO NOT MERGE 
Change-Id: I420fb7843a723d12f0578aeaac91f5e65ba85da2
Auto-generated-cl: translation import
 2016-05-24 15:10:18 -07:00
Jim Miller
9bf8474c27 Merge "Fix missing permission check when saving pattern/password" into mnc-dev 
am: 45c77d951a

* commit '45c77d951ab5203b8e19c2ed2ce3a0816e42b118':
  Fix missing permission check when saving pattern/password

Change-Id: I81947e95d5365bbf6a4927435f43c73dc4ac2bb0
 2016-05-24 22:08:16 +00:00
Amith Yamasani
503955db2b Merge "Don\'t deliver broadcast to apps that are being backed up" into nyc-dev am: fc2a7ce7ac am: b396f36bc3 
am: 1bbc2a1ffc

* commit '1bbc2a1ffc0bafeef9e46d1a4022e10ab05a4cf6':

Change-Id: I4b24142ffe3a9dde9ae979b5a27f8fefec82581b
 2016-05-24 22:07:58 +00:00
John Reck
c9bb1a38d3 Fix a translate issue with saveLayer 
Bug: 28667141

saveLayer clips the layer to the size it needs to
be and will translate content if necessary, but
the drawLayerOp that results from that was not
translated to handle the shifted draw content.

This fixes that

Change-Id: I3c9ffd5d0282fa1b958bced94c25e9744281e9be
 2016-05-24 15:06:01 -07:00
Jim Miller
45c77d951a Merge "Fix missing permission check when saving pattern/password" into mnc-dev 2016-05-24 22:04:37 +00:00
Johan T. Halseth
df296a7e68 Merge "Adding grantPermission for packageName" into nyc-mr1-dev 
am: b1f0e9705d

* commit 'b1f0e9705d253350852d6508878b4782578fbda6':
  Adding grantPermission for packageName

Change-Id: I59b23547464b776977b69ffba1ad544fc124ef0e
 2016-05-24 22:03:56 +00:00
Mady Mellor
f229d406d0 Fix clipping not being activated on children in groups 
Some views were not getting the call to reactivate clipping
this is because only the when the view was made visible
was it reset, views made invisible would be missed.

Fixes: 27364129
Change-Id: Ie6944569f432cd657f7f741c95c4067b346ea98b
 2016-05-24 15:01:22 -07:00
Amith Yamasani
1bbc2a1ffc Merge "Don\'t deliver broadcast to apps that are being backed up" into nyc-dev am: fc2a7ce7ac 
am: b396f36bc3

* commit 'b396f36bc3cc301eca8406acfb4b791ef4390cca':

Change-Id: I8c4fc0bba5bc5e77dc5a007563239f675661206b
 2016-05-24 22:01:19 +00:00
Amith Yamasani
e8015358d0 Merge "Don\'t deliver broadcast to apps that are being backed up" into nyc-dev am: fc2a7ce7ac am: b475c89a7b 
am: 02351ca3c4

* commit '02351ca3c4b36b905d366fa2a9ecd19160518930':
  Don't deliver broadcast to apps that are being backed up

Change-Id: I6782f3aec13d58139d760e3e2d13f7b3495b60f7
 2016-05-24 21:59:37 +00:00
Tianjie Xu
a05a44c2c8 Merge "Merge "Report OTA time statistics" into nyc-dev am: 86f97177e9 am: acf91cd6c5" into nyc-mr1-dev-plus-aosp 
am: d68e7a3dc9

* commit 'd68e7a3dc97769308b4f3f42663d6dc185a7c351':

Change-Id: Icfa5a7276e4193be848b5bcd5e5681193a2e059e
 2016-05-24 21:59:34 +00:00
Tianjie Xu
9ae172f9b9 Merge "Report OTA time statistics" into nyc-dev am: 86f97177e9 am: 7135fab76c 
am: 375a512c0d

* commit '375a512c0d99e58285b3e6d6f1045c5e3a9774d5':
  Report OTA time statistics

Change-Id: Icbd611fe4af2dd51d1ee946a80c0e0f4370a9634
 2016-05-24 21:59:28 +00:00
Allen Hair
3be1f843b0 Merge "Merge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7c7 am: f90c5c5f5a" into nyc-mr1-dev-plus-aosp 
am: d9d2224a65

* commit 'd9d2224a65193d3d1ad6cb26bd933865a627556e':

Change-Id: I21181cee4613821841b29e4ef85f1ea2bfd93491
 2016-05-24 21:59:23 +00:00
Johan Torås Halseth
b1f0e9705d Merge "Adding grantPermission for packageName" into nyc-mr1-dev 2016-05-24 21:58:00 +00:00
Doris Liu
bbeafd1199 Fix blue channel gets updated incorrectly in ChangeText transition 
Also fixed text's alpha channel gets incorrectly reset to fully
opaque.

Bug: 28919053
Bug: 28932357
Change-Id: Ib0ae6fe56ba4e09dea69534868e764e65e888e62
 2016-05-24 14:56:08 -07:00
Amith Yamasani
02351ca3c4 Merge "Don\'t deliver broadcast to apps that are being backed up" into nyc-dev am: fc2a7ce7ac 
am: b475c89a7b

* commit 'b475c89a7b6b46688cd44f18d53ffe8891c81757':
  Don't deliver broadcast to apps that are being backed up

Change-Id: I7ced9d068f89f0f0854f3afa89ff8260774bbf8c
 2016-05-24 21:55:14 +00:00
Amith Yamasani
b396f36bc3 Merge "Don\'t deliver broadcast to apps that are being backed up" into nyc-dev 
am: fc2a7ce7ac

* commit 'fc2a7ce7acc5ede8b26f35819c8287df1fed135c':
  Don't deliver broadcast to apps that are being backed up

Change-Id: I531ddd28dd24ff567814cb455059ca9ddb24f145
 2016-05-24 21:55:01 +00:00
Jorim Jaggi
c59a23fb1b Make navigation bar always slippery 
Bug: 28939265
Change-Id: I47270e4e3a30d39580e700bc40ca172f62ab511d
 2016-05-24 14:53:36 -07:00
Amith Yamasani
b475c89a7b Merge "Don\'t deliver broadcast to apps that are being backed up" into nyc-dev 
am: fc2a7ce7ac

* commit 'fc2a7ce7acc5ede8b26f35819c8287df1fed135c':
  Don't deliver broadcast to apps that are being backed up

Change-Id: Ia6f492cb909603e1741e09c5138ea3a7160a97a6
 2016-05-24 21:50:57 +00:00
Amanda Kassay
2e5eca0eb8 Merge "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d am: 5a00e9d345 am: 0a6d5112f1 am: 11212a4822" into nyc-mr1-dev-plus-aosp 
am: b61ad7f393

* commit 'b61ad7f393b41e936383d079443759b8a9511178':

Change-Id: Idc49d4ad50c24561f3746d550102e8b1cec64a27
 2016-05-24 21:48:45 +00:00
Adam Lesinski
b97c75329b Merge "Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb am: 5e5e871fdc" into nyc-mr1-dev-plus-aosp 
am: 3b5dc2c480

* commit '3b5dc2c480e8003ac13ee1f87b30220793d0521c':

Change-Id: Ib8f3727987aab1ac609f8c18584f630c34065968
 2016-05-24 21:48:39 +00:00
Allen Hair
5d03b06749 Merge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7c7 am: 79f42608c2 
am: 3faf6c2e6c

* commit '3faf6c2e6c8f215c12f1d53b86ee606059521899':
  Deprecate shell-based UI Automator.

Change-Id: Iddcd0b3b23a8cae9f8b607c7d917791c55ec95ea
 2016-05-24 21:48:30 +00:00
Android Build Merger (Role)
d68e7a3dc9 Merge "Merge "Report OTA time statistics" into nyc-dev am: 86f97177e9 am: acf91cd6c5" into nyc-mr1-dev-plus-aosp 2016-05-24 21:48:29 +00:00
Amanda Kassay
f7691f2f8e Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d am: 5a00e9d345 am: 0a6d5112f1 am: 38ffaa1c51 
am: 49b9190d48

* commit '49b9190d48071802e5901c96d431c207ac8f18ff':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: I27b9856b0f1204b5a4c203bbbde49c0b7a5e1697
 2016-05-24 21:48:13 +00:00
Tianjie Xu
ba7cb54c4a Merge "Report OTA time statistics" into nyc-dev am: 86f97177e9 
am: acf91cd6c5

* commit 'acf91cd6c59ddf59e864411638eaf64506ff69bf':
  Report OTA time statistics

Change-Id: I53397bec443035fcba05b4b03508bb50cb48dfe4
 2016-05-24 21:47:55 +00:00
Tianjie Xu
375a512c0d Merge "Report OTA time statistics" into nyc-dev am: 86f97177e9 
am: 7135fab76c

* commit '7135fab76cb3e7f7a68547794b3ddf54f08facca':
  Report OTA time statistics

Change-Id: I82f174bfa383a26a87d45ac6675a3ae5812b50af
 2016-05-24 21:47:52 +00:00
Adam Lesinski
534881d8fa Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb am: 5e106dea45 
am: 9ed84d8612

* commit '9ed84d86120dd6487eacba503f45f6d147f05fbf':
  Improve performance of LocaleList with Resources

Change-Id: I7c1694545f9eee940ca7065f3ac5aee5e2a7b27c
 2016-05-24 21:47:36 +00:00
Amith Yamasani
fc2a7ce7ac Merge "Don't deliver broadcast to apps that are being backed up" into nyc-dev 2016-05-24 21:43:53 +00:00
Danny Epstein
251f22baec Left and right margins for watch preferences. 
BUG: 27779149
Change-Id: I8cc10274a157a244e8ecbdb7681cc8e44786f852
 2016-05-24 14:43:52 -07:00
Dianne Hackborn
a8c16935d9 Fix issue #28931042: wtf in system server 
Broadcast needs to have a valid action.  We'll just pick
a generic one, since the receiver here doesn't care.

Change-Id: Ifff87626d11dd9fafb4e68819e8c8cecdf7fe1aa
 2016-05-24 14:43:47 -07:00
Android Build Merger (Role)
d9d2224a65 Merge "Merge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7c7 am: f90c5c5f5a" into nyc-mr1-dev-plus-aosp 2016-05-24 21:42:57 +00:00
Android Build Merger (Role)
b61ad7f393 Merge "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d am: 5a00e9d345 am: 0a6d5112f1 am: 11212a4822" into nyc-mr1-dev-plus-aosp 2016-05-24 21:42:43 +00:00
Android Build Merger (Role)
3b5dc2c480 Merge "Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb am: 5e5e871fdc" into nyc-mr1-dev-plus-aosp 2016-05-24 21:42:32 +00:00