drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
162,758 Commits 1 Branch 0 Tags
Commit Graph

162758 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
6a903c31fe am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 
* commit '84c5e8ebf0185ca65d4bab148f6d72d71940aba8':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:09:48 +00:00
Fyodor Kupolov
c87d162815 Run isKeyguardSecure under system privileges 
In certain cases, isKeyguardSecure calls UserManager.getProfileParent, which
requires MANAGE_USERS permission.
Now the check is done under system privileges.

Bug:18765066
Change-Id: I6b23aedee06403d36523af5fee9c7db9659284b3
 2015-01-13 11:06:04 -08:00
Wink Saville
84c5e8ebf0 Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 2015-01-13 19:02:07 +00:00
Bryce Lee
e036ce2e70 am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev 
* commit '9320e9f0a6af9269bc145ec7ab3d4b351f0614af':
  Update javadoc for DEFAULT_FEATURES deprecation.
 2015-01-13 19:01:24 +00:00
Adam Powell
57744dd139 am 69c22e82: Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev 
* commit '69c22e82e9c3e95f4689a57320de3199ffd29262':
  Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
 2015-01-13 19:01:19 +00:00
Bryce Lee
9320e9f0a6 Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev 2015-01-13 18:59:36 +00:00
Adam Powell
69c22e82e9 Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev 2015-01-13 18:57:33 +00:00
Nicolas Prevot
b14ed95647 Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING 
BUG:18983720

Change-Id: I3af3354f746cd2981cdb8ba2ed6cc380665249ee
 2015-01-13 18:46:44 +00:00
Winson Chung
b1a0a57cca Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev 
automerge: 7ce662e  -s ours

* commit '7ce662ef870df34cd189b4ce9e487e496ba407dd':
  DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.
 2015-01-13 18:19:39 +00:00
Winson Chung
7ce662ef87 Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev 2015-01-13 18:16:22 +00:00
Nicolas Prévot
e5d3ee8e4f Merge "Clarify docs for user restrictions" into lmp-mr1-dev 
automerge: 6ab76bd

* commit '6ab76bd434d587fecefd5801905b09bcd32b1661':
  Clarify docs for user restrictions
 2015-01-13 17:39:34 +00:00
Nicolas Prévot
6ab76bd434 Merge "Clarify docs for user restrictions" into lmp-mr1-dev 2015-01-13 17:35:14 +00:00
Bryce Lee
aa1008cba4 Update javadoc for DEFAULT_FEATURES deprecation. 
Bug: 18983343
Change-Id: I10936e292edf9146e7acca231632fb704054215c
 2015-01-13 09:26:46 -08:00
Ricardo Cervera
cca3d44b70 am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a 
automerge: 8eb3060

* commit '8eb306077d603baae0d8e00a909f97275f83f3db':
  docs: Fix broken link in Common Intents
 2015-01-13 16:55:00 +00:00
Ricardo Cervera
8eb306077d am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a 
* commit '62ceea31564ac27c84ff78b400f844be98917c29':
  docs: Fix broken link in Common Intents
 2015-01-13 16:49:57 +00:00
Ricardo Cervera
62ceea3156 am f5569413: docs: Fix broken link in Common Intents 
automerge: c2d373a

* commit 'c2d373a0a7bb45e8c8a282781c5bc4f75db86b7d':
  docs: Fix broken link in Common Intents
 2015-01-13 16:42:22 +00:00
Wink Saville
071743f0cb Rename reg/unreg OnSubscriptionsChangedListener. 
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
 2015-01-13 08:36:24 -08:00
Ricardo Cervera
c2d373a0a7 am f5569413: docs: Fix broken link in Common Intents 
* commit 'f556941357ea391cae6dcd2e22b71a837a216d06':
  docs: Fix broken link in Common Intents
 2015-01-13 16:35:04 +00:00
Ricardo Cervera
f556941357 docs: Fix broken link in Common Intents 
Bug: 18991366

Change-Id: I998e5213bb7117ebd26ab335206f430f60d1c537
 2015-01-13 08:28:22 -08:00
Narayan Kamath
c63a16b8e4 Fix unexpected language changes on SIM card insertion. 
There are two separate issues here that need to be fixed, both
boil down to the fact that adding an imperative (userSetLocale)
to the Configuration is a bad idea. Because of this:

- We'd never persist the first user set configuration if it was en_US,
  because of an erroneous call to Configuration.setLocale.

- ActivityManager.getConfiguration would sometimes return a
  Configuration with userSetLocale == true, which means callers with
  the right permissions would inadvertently persist a locale they didn't
  want to persist.

bug: 18879010

Change-Id: Id330ffde9d2a6e516fd60edc33f5529df719c634
 2015-01-13 16:27:17 +00:00
Amith Yamasani
150514bd03 Clarify docs for user restrictions 
Specify which restrictions are not relevant or behave differently
for managed profiles.

Bug: 18768578
Change-Id: Iac1435c5b931cbb889902a9b9e427bc0e0778bf2
 2015-01-13 16:04:42 +00:00
Paul Jensen
9936484667 Don't blindly teardown unvalidated networks when releasing NetworkRequests. 
These networks may be on their way to becoming validated at which point
they could satisfy the default NetworkRequest.  This change unifies the
is-this-network-needed code into a single function.

bug:18652378
Change-Id: Ia511d5c66be79b47dd7c9348ec02784ab30b960c
 2015-01-13 09:05:38 -05:00
Alan Viverette
82bdfcfadc Update docs for Window.setElevation(), apply changes immediately 
automerge: 71922de

* commit '71922de6c8e407ff24bb1a500cb53bb1a647c758':
  Update docs for Window.setElevation(), apply changes immediately
 2015-01-13 02:16:32 +00:00
Winson Chung
98e8f7ac5e DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes. 
Fixes an issue where the screen pinning UI in the Overview space would
not appear on the first load after changing the setting, this was because
the updated flag was not read before the tasks were preloaded prior to
entering the Overview space.

Bug: 18986736
Change-Id: I50dc9ff6d369fb3f2593f2bf2c1dc4608878820f
 2015-01-12 17:36:47 -08:00
Eino-Ville Talvala
f913334749 Camera: Clarify JNI exception message 
This exception may be generated through MediaRecorder method calls
as well, so clarify that the issue is an invalid camera object.

Bug: 18414095
Change-Id: I189ab1a71ab0d6a432b87c45a82c90fe11d22ef8
 2015-01-12 17:02:03 -08:00
Alan Viverette
71922de6c8 Update docs for Window.setElevation(), apply changes immediately 
BUG: 18983689
Change-Id: I471104092d6296dc0ba2689da96783be088fbce8
 2015-01-12 16:14:02 -08:00
Michael Wright
2ed0513f20 Clean up graphics resources. 
Release SurfaceTexture after use in ColorFade and delete GL resources
in ImageWallpaper.

Bug: 17871993
Change-Id: I05bda03657ca502ba35b7187b6f361018f7ef687
 2015-01-12 15:31:02 -08:00
Scott Rowe
8443fad483 docs: Add screenshot 
Change-Id: I0995d23e1df30ce17ce381c14a6cbd2de389c396
 2015-01-12 14:50:50 -08:00
Ricardo Cervera
cb09d8d08a am 9a19ed17: am eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
* commit '9a19ed17e1f36894aac8250dcf9649998d9c2603':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 22:22:59 +00:00
Ricardo Cervera
9a19ed17e1 am eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
* commit 'eec6dd779ca170a80ff457828e2687da834d2c1f':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 22:16:09 +00:00
Wale Ogunwale
42b0d10a83 am 1ea6afe1: Merge "Don\'t allow windows with invalid types to be added." into lmp-mr1-dev 
* commit '1ea6afe1234b04de0f5b3f9ac5802b1c6d42e8ac':
  Don't allow windows with invalid types to be added.
 2015-01-12 22:15:58 +00:00
Wale Ogunwale
1ea6afe123 Merge "Don't allow windows with invalid types to be added." into lmp-mr1-dev 2015-01-12 22:03:50 +00:00
Wale Ogunwale
74bf065e43 Don't allow windows with invalid types to be added. 
Bug: 18950225
Change-Id: Ia7ead72d036c7628e0a97f8fe9fef2a35525e4df
 2015-01-12 14:01:25 -08:00
Ricardo Cervera
eec6dd779c am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
* commit 'a87f35555d4aca13902a334691815cfa462feb30':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 21:59:33 +00:00
Ricardo Cervera
a87f35555d am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
* commit 'd8bd117ce017d7e9b967d7949f8ca3e661e2cd39':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 21:53:27 +00:00
Ricardo Cervera
d8bd117ce0 Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 2015-01-12 21:49:23 +00:00
Joe Fernandez
d3b6d61d13 am d15b54d2: am 0bb84bb5: am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 
* commit 'd15b54d23fbc2f5582c9491cca46830b84f388ae':
  docs: Removing obsolete L-Preview docs and images
 2015-01-12 21:46:38 +00:00
Joe Fernandez
d15b54d23f am 0bb84bb5: am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 
* commit '0bb84bb5e2a137475718e31fb25f06b160163588':
  docs: Removing obsolete L-Preview docs and images
 2015-01-12 21:39:24 +00:00
Joe Fernandez
56c56f7d20 am 520a3c82: am acd5f3ab: am 1946978c: am 76110e7c: docs: Remove Wear preview reference docs 
* commit '520a3c825855e27de8b755f358c6849d08c7edd0':
  docs: Remove Wear preview reference docs
 2015-01-12 21:37:06 +00:00
Joe Fernandez
0bb84bb5e2 am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 
* commit '661ca54706c146697fe45dfcf81840c25b9022b2':
  docs: Removing obsolete L-Preview docs and images
 2015-01-12 21:34:19 +00:00
Joe Fernandez
520a3c8258 am acd5f3ab: am 1946978c: am 76110e7c: docs: Remove Wear preview reference docs 
* commit 'acd5f3ab40c81b5267b4b551e0fd55ce839351b9':
  docs: Remove Wear preview reference docs
 2015-01-12 21:31:02 +00:00
Joe Fernandez
661ca54706 am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 
* commit '8062f1f34113f4d73d37ebb57245342cca9d8f9c':
  docs: Removing obsolete L-Preview docs and images
 2015-01-12 21:27:24 +00:00
Joe Fernandez
acd5f3ab40 am 1946978c: am 76110e7c: docs: Remove Wear preview reference docs 
* commit '1946978c5341fe06db287a4535769ea12e6b6745':
  docs: Remove Wear preview reference docs
 2015-01-12 21:25:42 +00:00
Joe Fernandez
8062f1f341 Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 2015-01-12 21:23:17 +00:00
Joe Fernandez
1946978c53 am 76110e7c: docs: Remove Wear preview reference docs 
* commit '76110e7c46297a221d8f2c92fbaef46b6f405294':
  docs: Remove Wear preview reference docs
 2015-01-12 21:16:26 +00:00
Jason Monk
a50a66824c am 0a1eb640: Merge "Carrier text handle sim removal" into lmp-mr1-dev 
* commit '0a1eb640d29830813bb478b8635763a708b6310c':
  Carrier text handle sim removal
 2015-01-12 21:06:46 +00:00
Jason Monk
0a1eb640d2 Merge "Carrier text handle sim removal" into lmp-mr1-dev 2015-01-12 21:00:09 +00:00
Ricardo Cervera
afd23aba8e docs: Add parent calls to WatchFaces snippet. 
Bug: 18982021

Change-Id: I2b39255827826d1e097ccba97e90e92a587fc39b
 2015-01-12 12:54:32 -08:00
Prashant Malani
4212bf1fad am b71f9f96: Merge "Improve the circularMask for round displays" into lmp-mr1-dev 
* commit 'b71f9f96f7f464267c59a80add495388338ced04':
  Improve the circularMask for round displays
 2015-01-12 18:40:56 +00:00
Prashant Malani
b71f9f96f7 Merge "Improve the circularMask for round displays" into lmp-mr1-dev 2015-01-12 18:34:46 +00:00