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

196657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aravind Akella
32207e3c66 Merge "Changes to Data Injection mode APIs" into mnc-dev 2015-07-01 17:39:57 +00:00
Geoff Mendal
5e039e64bd Import translations. DO NOT MERGE 
Change-Id: I1492b302d8c75b2b6c9d5f0a51a65ab8c8d3e848
Auto-generated-cl: translation import
 2015-07-01 12:29:58 -05:00
Filip Gruszczynski
0385059195 Handle outsets when resized is called due to rotation. 
Rotation might change while the wallpaper is displayed. If outsets are
present, this must trigger a resized callback and the wallpaper must
take these accounts immediately into account before requesting relayout.

Bug: 22209764

Change-Id: I97f2670f384ccac792e7c2727eb0ef017ec66188
 2015-07-01 10:23:47 -07:00
Wale Ogunwale
44000724ef am 5278cea1: am d72dc762: am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev 
* commit '5278cea1f35b2b54606cc1bb78195bd2f84953da':
  Prevent system uid component from running in an app process
 2015-07-01 17:19:26 +00:00
Wale Ogunwale
f54d17224b am 52034328: am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev 
* commit '52034328081e8c3420f9228192343835465afa13':
  Prevent system uid component from running in an app process
 2015-07-01 17:19:20 +00:00
Wale Ogunwale
7ab264abc2 am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit '742bfa809cf2c022d690f84b4213e908ee66e8aa':
  Prevent system uid component from running in an app process
 2015-07-01 17:17:23 +00:00
Luan Nguyen
0794acc557 am a4ac253b: am ed053477: Merge "docs: Move scale Bitmap code to onSurfaceChanged" into mnc-preview-docs 
* commit 'a4ac253bc36bbced5acad8a7ddf1838b11f6e44c':
  docs: Move scale Bitmap code to onSurfaceChanged
 2015-07-01 17:13:03 +00:00
Amit Mahajan
4b2d706155 am 45e50f87: (-s ours) am 71699d76: am 95c47354: am 43d3bd02: am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '45e50f87bb2b2cd11b19ee102223c03356d77042':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-07-01 17:12:53 +00:00
Joe Fernandez
3cc50169fe am f1f720b6: am cbbbabaa: am 4c8ecd9a: am 72356f0b: am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit 'f1f720b607ef6150f79095e2dd7ab1e62fc03c10':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-07-01 17:12:45 +00:00
Rich Slogar
d88767da1e am e3d8df63: am 3de121f9: Merge "docs: studio workflow page typo" into mnc-preview-docs 
* commit 'e3d8df63076241a3d3637643e6ff1530bca5a5b2':
  docs: studio workflow page typo
 2015-07-01 17:12:39 +00:00
Robert Schaub
a50979997c am e51d6d05: am fae35eed: Merge "docs: Changed link in Java source code comment to repair 404" into mnc-preview-docs 
* commit 'e51d6d05e9334fce5d46909ea669027762c4c0a2':
  docs: Changed link in Java source code comment to repair 404
 2015-07-01 17:12:31 +00:00
Jay Shrauner
6ce5d68a58 Catch SecurityExceptions 
Bug:22208649
Change-Id: I608be28095a2d7ee0e3dd739ed899eaae55e700e
 2015-07-01 10:07:17 -07:00
Wale Ogunwale
5278cea1f3 am d72dc762: am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev 
* commit 'd72dc76275d7d0cc9559e0e5439bcc3ccbda81a2':
  Prevent system uid component from running in an app process
 2015-07-01 17:03:58 +00:00
Wale Ogunwale
5203432808 am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev 
* commit '131e6b24d88c4704687f41e9a016ab1919c53fa4':
  Prevent system uid component from running in an app process
 2015-07-01 17:03:54 +00:00
Filip Gruszczynski
d40c423b1c Merge "resolved conflicts for merge of 300ccf4a to mnc-dev" into mnc-dev 2015-07-01 17:03:03 +00:00
Wale Ogunwale
742bfa809c am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'f3dbb57ee8fce4b7c2cad352ebe5096a880ae06b':
  Prevent system uid component from running in an app process
 2015-07-01 17:03:02 +00:00
John Reck
a4ac386d2a Merge "Make querying the graphics stats service more defensive" into mnc-dev 2015-07-01 16:56:09 +00:00
John Reck
1e4209e387 Use std::sort instead of quickSortX 
Bug: 22208220

Libcxx has a really good sort algorithm, use that
instead. This speeds up shadow tesellation by about 10%.

Also less code

Change-Id: Iaad424187121d7644076f94ba8a3cf4c110da2f2
 2015-07-01 09:54:47 -07:00
Wale Ogunwale
f3dbb57ee8 am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'c215b2b24575e6d7693f396c7fdfe675d5ea9d1c':
  Prevent system uid component from running in an app process
 2015-07-01 16:39:11 +00:00
David Friedman
c921ee10a3 Docs: Localizations of Android dev on-boarding training docs. 
Bug: 20503574

Change-Id: I348ca743dc106eef7cca5ff8d9855398fc3b3b54
 2015-07-01 09:36:33 -07:00
Wale Ogunwale
d72dc76275 am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev 
* commit 'ec425a19f973e2511485b61424dffb9f3cafb542':
  Prevent system uid component from running in an app process
 2015-07-01 16:35:21 +00:00
Wale Ogunwale
131e6b24d8 Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev 2015-07-01 16:30:43 +00:00
Wale Ogunwale
ec425a19f9 am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev 
* commit 'df9948d81232a03271113c16bee6f3ab6b826bad':
  Prevent system uid component from running in an app process
 2015-07-01 16:18:42 +00:00
Wale Ogunwale
c215b2b245 am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'dc9cfca80139714ca37122148d041beedbf0ceb2':
  Prevent system uid component from running in an app process
 2015-07-01 16:18:17 +00:00
Wale Ogunwale
df9948d812 Merge "Prevent system uid component from running in an app process" into lmp-dev 2015-07-01 16:06:48 +00:00
Wale Ogunwale
dc9cfca801 Merge "Prevent system uid component from running in an app process" into klp-dev 2015-07-01 16:06:34 +00:00
Nicolas Prevot
107f7b7bec Fix the case where an intent bounces several times between users. 
An intent may bounce several times between users.
In this case, we want mContentUserHint to refer to the original
user.

BUG:19656340
Change-Id: I22a35fab0c228140dcb223899f5e38ff33ee5aed
 2015-07-01 17:05:18 +01:00
Chris Wren
c58d169530 Merge changes from topic 'tron' into mnc-dev 
* changes:
  remove double count of panel open
  report notification load on panel reveal
 2015-07-01 15:33:32 +00:00
Paul Jensen
e51c46b068 Merge "Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API" into mnc-dev 2015-07-01 14:31:21 +00:00
George Mount
cb23ec418e Merge "Add missing addPauseListener." into mnc-dev 2015-07-01 14:10:11 +00:00
Geoff Mendal
0c53a89ea9 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-01 13:58:20 +00:00
Geoff Mendal
e9eef64495 Import translations. DO NOT MERGE 
Change-Id: I53dabfe326ba0f15b66ecac3829e6b8f55b33924
Auto-generated-cl: translation import
 2015-07-01 08:50:39 -05:00
Geoff Mendal
4f18c7e0c0 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-01 13:40:44 +00:00
Geoff Mendal
c9b6c1767f Import translations. DO NOT MERGE 
Change-Id: Id27150d5e6b378f1fe9e79eb0ea8b88392b2cd09
Auto-generated-cl: translation import
 2015-07-01 08:38:57 -05:00
Paul Jensen
72a77993bd Merge "Log DNS results for network validation attempts" into mnc-dev 2015-07-01 12:43:15 +00:00
Paul Jensen
35daa43e5d Merge "Reducing logging in NetworkMonitor to avoid getting muted" into mnc-dev 2015-07-01 12:42:07 +00:00
Nicolas Prevot
81b7b10864 In NfcActivityManager, don't use UserHandle.CURRENT. 
In the work profile, UserHandle.CURRENT refers to the primary user.
We want to refer to the work profile itself.
So, using new UserHandle(UserHandle.myUserId()) instead.

BUG:21960385
Change-Id: I4d880ccf6926e437d674874295029b29278f3e12
 2015-07-01 12:27:09 +01:00
Keisuke Kuroyanagi
4712b8ef9e Fix: Selection handles can remain on home screen. 
This happened as selection handles are shown even when
selection action mode is not active.

Bug: 22188927
Change-Id: Ifd88b91d98cc6f9b0c578e782144b6eee1bdeec9
 2015-07-01 20:06:51 +09:00
David Friedman
16add46c5c Docs: Adding localized TOC for Preview docs. 
This change is associated with Bug 21789313 and CL 718631.

Change-Id: Ifb5db3d80fe01cc3f99000b812f9570777c39228
 2015-07-01 01:37:33 -07:00
Chris Banes
2bc8485ba7 Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev 2015-07-01 07:58:05 +00:00
Miao Wang
8a752abe77 Merge "[RenderScript] update the type of offsets for BLAS.BNNM" into mnc-dev 2015-07-01 05:12:07 +00:00
Ronghua Wu
e0b71b4ef7 Merge "media: clean up the usage of max-supported-instances." into mnc-dev 2015-07-01 04:00:23 +00:00
Svet Ganov
ca58d80f41 Clear binder identity when grantint permisisons to carrier apps 
bug:22204562

Change-Id: I79dc2e102d227c991adc849e1cbda8572ee14905
 2015-06-30 19:40:21 -07:00
Selim Cinek
4949c75f1e Fixed accessibility order for quick settings 
Bug: 20535538
Change-Id: I4e464c54158eb575208f6361af295ae702b19b21
 2015-06-30 19:38:26 -07:00
Svet Ganov
22233b51c3 Merge "Remove the empty accounts group and not needed storage resources." into mnc-dev 2015-07-01 02:32:50 +00:00
Carlos Valdivia
c37ee22714 Tweak GET_ACCOUNTS behavior and improve memory. 
Related to recent permissions and system health changes. This change
will make it so that calls to AccountManager#getAccountsByType will work
for the owning account authenticator even if they don't have
permissions. This is pretty fundamental to having a working
authenticator and it doesn't make sense to have it be disabled (or have
authenticators hack around the framework).

Also changed how TokenCache works so that memory usage is still
predictable (no more than 64kb) but token caching won't be at the mercy
of garbage collection. This is important for writing stable cts tests.

Change-Id: Ib31b550616b266ee5a04eb26b04ba0023ca0cb83
 2015-06-30 19:30:36 -07:00
Christopher Tate
2438c9b2e7 Merge "Fix dispatch of onRestoreFinished()" into mnc-dev 2015-07-01 01:25:54 +00:00
Svetoslav
0010b70bea Grant permissions to headless system calendar/contacts sync adapters. 
bug:21861781

Change-Id: I5f9905a23ba1b23e387adf2cea842172d34207b0
 2015-06-30 18:22:20 -07:00
Aravind Akella
b02e6050bd Fix for last sensor missing from sensor list returned by the HAL. 
Bug: 22072216
Change-Id: I39a422fb80adcd348ff9c10bf3d3f19ab569a0af
 2015-06-30 18:02:45 -07:00
Christopher Tate
758de809b9 Fix dispatch of onRestoreFinished() 
The agent instance wasn't properly being conveyed from the generic
restore engine implementation to the state machine handling the
lifecycles.  On top of that, the lifecycle wasn't advancing to the
restore-finished callback phase properly in the full-data restore
case.

Bug 22194736

Change-Id: Ic649d6a196adbd21a4a0f3083c7eed2fff383e52
 2015-06-30 17:58:27 -07:00