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

153269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav
058e1f5a38 Merge "NumberPicker not announcing current selection." into lmp-dev 2014-09-03 21:29:16 +00:00
Ricardo Cervera
a4fe79a4c4 docs: Adding Sony logo to wear page 
Change-Id: I5e56ca313364d832bb26f7b07891381a0c2b55df
 2014-09-03 14:27:50 -07:00
Jean-Michel Trivi
f557832ad8 am 1c9d1485: am 6d4873f5: am 0511ba50: Do not persist and restore the media button event receiver 
* commit '1c9d1485f381d610152abd64bfaa6d5d963878d2':
  Do not persist and restore the media button event receiver
 2014-09-03 21:23:49 +00:00
Ricardo Cervera
2d80f9317f docs: Adding Sony logo to Wear partners 
Change-Id: I3c4b52d647f0a942ef5d5daad6fb6d5197839f2d
 2014-09-03 14:17:06 -07:00
Christopher Tate
539b217b76 The transport system API needs to manage binder identity 
...around writing settings.  It does its own proper permission check;
it just needs to make sure not to accidentally crash the caller in
strange and wondrous ways because of failing to clear binder identity
before writing the result to secure settings.

Bug 16542048

Change-Id: I88d1f2dbeebd24eed5d86989f0ca0d834878b054
 2014-09-03 14:12:11 -07:00
Jean-Michel Trivi
1c9d1485f3 am 6d4873f5: am 0511ba50: Do not persist and restore the media button event receiver 
* commit '6d4873f577774e5e7427e2675e4c6ff8049646be':
  Do not persist and restore the media button event receiver
 2014-09-03 21:11:13 +00:00
Eino-Ville Talvala
207b43c751 am 25c35986: Merge "JobScheduler: Fix doc build break" into lmp-dev 
* commit '25c3598620c9e1a2c8ab3aea766e9da31bc2c5be':
  JobScheduler: Fix doc build break
 2014-09-03 21:00:51 +00:00
Nancy Chen
84f403825c am d93b5e24: Merge "Update api for onConnectionAdded/Removed" into lmp-dev 
* commit 'd93b5e24595d50c70d94217c871aca60bd9cabed':
  Update api for onConnectionAdded/Removed
 2014-09-03 21:00:46 +00:00
Jean-Michel Trivi
6d4873f577 am 0511ba50: Do not persist and restore the media button event receiver 
* commit '0511ba506d30d0a517491a92eda8d001a441d557':
  Do not persist and restore the media button event receiver
 2014-09-03 20:59:53 +00:00
Eino-Ville Talvala
b10e39e716 Merge "JobScheduler: Fix doc build break" into lmp-dev 2014-09-03 20:53:34 +00:00
Marco Fucci
0dd873dbef am dc6323ce: Merge "Disconnect TrustAgent when not active." into lmp-dev 
* commit 'dc6323ceddffdc552fba76b7512687291d9ca8db':
  Disconnect TrustAgent when not active.
 2014-09-03 20:51:25 +00:00
Eino-Ville Talvala
93b47603bf JobScheduler: Fix doc build break 
Change-Id: I769da7274fe5e3f64a47c82f893afeee6a11254e
 2014-09-03 20:51:13 +00:00
Nancy Chen
0c76727916 Merge "Update api for onConnectionAdded/Removed" into lmp-dev 2014-09-03 20:51:12 +00:00
Marco Fucci
8364885a7d Merge "Disconnect TrustAgent when not active." into lmp-dev 2014-09-03 20:39:05 +00:00
Nancy Chen
b5acab4639 Update api for onConnectionAdded/Removed 
Removed methods from public API for previous change.

Bug: 17262026
Change-Id: Ic41eccf8b9c1489b6261758640a35664b39ea819
 2014-09-03 13:33:46 -07:00
Amith Yamasani
f0ccb153b3 am f27739f7: Merge "Add some @SystemApi tags for internal user-related APIs" into lmp-dev 
* commit 'f27739f78aa38da5e3a29e2a1e03c21b6f95f5ee':
  Add some @SystemApi tags for internal user-related APIs
 2014-09-03 20:32:57 +00:00
Julian Odell
2c9e137fab am 45ae7fb1: Merge "Bug 17262099: MMS API changes (multi-project)." into lmp-dev 
* commit '45ae7fb1d9981f9b17871c30e210db2a10d19075':
  Bug 17262099: MMS API changes (multi-project).
 2014-09-03 20:27:08 +00:00
Svetoslav
ca50566101 NumberPicker not announcing current selection. 
bug:17299486

Change-Id: I73fd33ef3518ef8e6cdd40cd036e8f104dc492b6
 2014-09-03 13:26:34 -07:00
Amith Yamasani
bef1036af7 Merge "Add some @SystemApi tags for internal user-related APIs" into lmp-dev 2014-09-03 20:26:10 +00:00
Nick Kralevich
fe0fed54a4 am ad0a66ac: am c1ce74ca: Merge "Revert "SELinuxMMAC unit tests"" 
* commit 'ad0a66acf4a28646bd1a0060736cdb8e7d9712a4':
  Revert "SELinuxMMAC unit tests"
 2014-09-03 20:20:34 +00:00
Julian Odell
6c25708eb5 Merge "Bug 17262099: MMS API changes (multi-project)." into lmp-dev 2014-09-03 20:20:34 +00:00
Amith Yamasani
0e8d7d63ba Add some @SystemApi tags for internal user-related APIs 
Also added an internal isManagedProfile()

Bug: 17371392
Change-Id: Ibcc26771d954505cbd530192bf4a8a25a8d4cae0
 2014-09-03 13:17:28 -07:00
Evan Charlton
147fb18db7 am adb87527: Merge "Remove startActivityFromInCall API" into lmp-dev 
* commit 'adb8752767b5ac1a35b0d239e550c6b39b81f771':
  Remove startActivityFromInCall API
 2014-09-03 20:16:51 +00:00
Nick Kralevich
ad0a66acf4 am c1ce74ca: Merge "Revert "SELinuxMMAC unit tests"" 
* commit 'c1ce74cab0e83d574df1bd7bb7b7eb16eec171f6':
  Revert "SELinuxMMAC unit tests"
 2014-09-03 20:14:31 +00:00
Julian Odell
31ef14d4f0 Bug 17262099: MMS API changes (multi-project). 
Move MMS api to using content provider rather than byte[] to pass MMS message contents.
Rebased and merged into TOT.

Change-Id: I3509b2774b1cb30a1c8100bb25d283140c963b6b
 2014-09-03 13:11:56 -07:00
Brian Carlstrom
2803b6854b am c74dc4b7: Merge "Restrict lazy dexopt to eng builds only" into lmp-dev 
* commit 'c74dc4b73b59f41b25e78a4f7970546dfa3c25dc':
  Restrict lazy dexopt to eng builds only
 2014-09-03 20:09:00 +00:00
Evan Charlton
4d12a03771 Merge "Remove startActivityFromInCall API" into lmp-dev 2014-09-03 20:07:47 +00:00
Nick Kralevich
c1ce74cab0 Merge "Revert "SELinuxMMAC unit tests"" 2014-09-03 20:04:27 +00:00
Nick Kralevich
01a5aa95d9 Revert "SELinuxMMAC unit tests" 
Broken build.

frameworks/base/services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTests.java:89: error: constructor PackageParser in class PackageParser cannot be applied to given types;
        PackageParser packageParser = new PackageParser(archiveFilePath);
                                      ^
  required: no arguments
  found: String
  reason: actual and formal argument lists differ in length
frameworks/base/services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTests.java:93: error: method parsePackage in class PackageParser cannot be applied to given types;
        PackageParser.Package pkg = packageParser.parsePackage(sourceFile,
                                                 ^
  required: File,int
  found: File,String,DisplayMetrics,int
  reason: actual and formal argument lists differ in length
frameworks/base/services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTests.java:99: error: incompatible types
        boolean savedCerts = packageParser.collectCertificates(pkg, 0);
                                                              ^
  required: boolean
  found:    void
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
3 errors
make: *** [out/target/common/obj/APPS/FrameworksServicesTests_intermediates/classes-full-debug.jar] Error 41

This reverts commit 2f446561f2f6d1b320b34432854d2f55e5b56f9e.

Change-Id: I0aa992d7b9eccce7e38c430a8a96084a6ee99866
 2014-09-03 20:03:17 +00:00
Brian Carlstrom
e7a2138635 Merge "Restrict lazy dexopt to eng builds only" into lmp-dev 2014-09-03 20:02:42 +00:00
Wink Saville
d8ca408420 am 3c95cae1: Merge "Rename getActivatedXxx to getActiveXxx" into lmp-dev 
* commit '3c95cae1ab33a0fd3bd93422e91a8182bf49d017':
  Rename getActivatedXxx to getActiveXxx
 2014-09-03 19:57:53 +00:00
Wink Saville
baaa4ef6f0 Merge "Rename getActivatedXxx to getActiveXxx" into lmp-dev 2014-09-03 19:50:55 +00:00
Matthew Xie
46247d56df am 0465993a: Merge "Close the base socket when bindListen fails" into lmp-dev 
* commit '0465993a8c0ddec88311db561b1220786150344a':
  Close the base socket when bindListen fails
 2014-09-03 19:36:10 +00:00
Matthew Xie
ddfa8e18fd Merge "Close the base socket when bindListen fails" into lmp-dev 2014-09-03 19:29:03 +00:00
Matthew Xie
726652e9d3 Close the base socket when bindListen fails 
Bug: 10773872
Change-Id: I0a72b2eb65055fa1959070d2dc32d40a573bd6f2
 2014-09-03 19:25:39 +00:00
Paul Jensen
00f0ced3d2 am bacfc3d4: Merge "Use alarm rather than delayed message to end lingering." into lmp-dev 
* commit 'bacfc3d4d9cb50d08035b54529612806e4bd055e':
  Use alarm rather than delayed message to end lingering.
 2014-09-03 19:24:33 +00:00
Nancy Chen
17b1f9138a am 6ad18828: Merge "Remove onConnectionAdded/Removed() from ConnectionService API" into lmp-dev 
* commit '6ad1882879c9e537d85079d6a13a6a5c50ba5900':
  Remove onConnectionAdded/Removed() from ConnectionService API
 2014-09-03 19:24:23 +00:00
Marco Fucci
4e68f11672 Disconnect TrustAgent when not active. 
Bug: 17191952
Change-Id: I470261f659a573400b2eb1421eeb953c87e58b66
 2014-09-03 12:24:22 -07:00
Glenn Kasten
65137ae765 am 57d76e43: Merge "Fix regression in CTS for AudioTrack" into lmp-dev 
* commit '57d76e43874309a15d3910bf5e151b4d671e7d3c':
  Fix regression in CTS for AudioTrack
 2014-09-03 19:23:35 +00:00
Alan Viverette
79464269aa am 3778a6aa: Merge "Remove partial support for hotspot changes on focus movement" into lmp-dev 
* commit '3778a6aa6069dae2e7f012732f47c6a7e5196364':
  Remove partial support for hotspot changes on focus movement
 2014-09-03 19:23:15 +00:00
Wink Saville
7d725d3919 am dadcc85e: Merge "Prepare to make SubscriptionManager public." into lmp-dev 
* commit 'dadcc85e58bcf2389ebca0956e044fc8ccfcab09':
  Prepare to make SubscriptionManager public.
 2014-09-03 19:23:10 +00:00
Wink Saville
8a38a203a9 Rename getActivatedXxx to getActiveXxx 
Change-Id: Iba6d2805a69d3385c93b7ed3c6267b5b8b252a28
 2014-09-03 12:22:54 -07:00
Paul Jensen
1f0ce33821 Merge "Use alarm rather than delayed message to end lingering." into lmp-dev 2014-09-03 19:08:16 +00:00
Brian Carlstrom
230561eef4 Restrict lazy dexopt to eng builds only 
Bug: 16696554
Change-Id: I56bb63ce534842994a70df6b09843b4e3153c845
 2014-09-03 11:59:38 -07:00
Nancy Chen
8a34d9ed2a Merge "Remove onConnectionAdded/Removed() from ConnectionService API" into lmp-dev 2014-09-03 18:41:21 +00:00
John Reck
842bb5be58 am 0f6c29dc: am ef908af6: Merge "Have destroy call freePrefetchedLayers" into lmp-dev 
* commit '0f6c29dc47d4a9607e79480460a67837c527fd56':
  Have destroy call freePrefetchedLayers
 2014-09-03 18:33:24 +00:00
Tyler Gunn
2267c2ee12 am c1945d0b: am 5cc214b6: Merge "Add supported URI scheme to PhoneAccounts. (1/4)" into lmp-dev 
* commit 'c1945d0beca08931f410a522d42b5984db21a91f':
  Add supported URI scheme to PhoneAccounts. (1/4)
 2014-09-03 18:33:19 +00:00
Glenn Kasten
49367a367c Merge "Fix regression in CTS for AudioTrack" into lmp-dev 2014-09-03 18:31:59 +00:00
Alan Viverette
94b88e7103 Merge "Remove partial support for hotspot changes on focus movement" into lmp-dev 2014-09-03 18:31:47 +00:00
Wink Saville
7f6fa2a1cd Merge "Prepare to make SubscriptionManager public." into lmp-dev 2014-09-03 18:25:45 +00:00