Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
142,792 Commits 3 Branches 0 Tags
3cc8b491bed9a86d91dcddf113c48deb433106b5
Commit Graph

41612 Commits

Author SHA1 Message Date
Amith Yamasani
3cc8b491be am 83f39b51: am 1c44f4c7: Merge "Revert some new APIs for restrictions provider" into lmp-dev 
* commit '83f39b510d6bd8237018500496aa8673b15e9332':
  Revert some new APIs for restrictions provider
 2014-07-15 19:12:15 +00:00
Wei Wang
20bdee31c2 am e3eba6b2: am 218d557a: Merge "Remove MR2 BLE Advertising hidden API from L codebase (1/2)." into lmp-dev 
* commit 'e3eba6b286925dbc13c642833a6b85be6ee607a4':
  Remove MR2 BLE Advertising hidden API from L codebase (1/2).
 2014-07-15 19:12:12 +00:00
Chet Haase
ba2d03e267 am a4f5c521: am d9a1ccfa: Merge "Set existing TypeEvaluator on new KeyframeSet when changing object values" into lmp-dev 
* commit 'a4f5c521457b0a9de2862478730c12fd62cf4121':
  Set existing TypeEvaluator on new KeyframeSet when changing object values
 2014-07-15 19:12:05 +00:00
Narayan Kamath
50a8891a6c am b1bc099e: am 0928aa4c: Merge "Fix multiArch parsing for ApkLite." into lmp-dev 
* commit 'b1bc099e0a18ab1ae7bb15be414f53b7dd762cd2':
  Fix multiArch parsing for ApkLite.
 2014-07-15 17:10:23 +00:00
George Mount
b9fc14ad5d am 0b5701a2: am 52e49ed9: Don\'t lose ActivityOptions during orientation change. 
* commit '0b5701a2c843b39d968a5b640bd385acc24ed39d':
  Don't lose ActivityOptions during orientation change.
 2014-07-15 17:10:16 +00:00
Wei Wang
96e2285066 Merge "Remove MR2 BLE Advertising hidden API from L codebase (1/2)." into lmp-dev 2014-07-15 16:05:04 +00:00
Chet Haase
4ae3e6af08 Set existing TypeEvaluator on new KeyframeSet when changing object values 
This avoids NullPointerException crash when changing values without
first canceling a running animator.

Issue #16245303 KeyframeSet crash on null keyframe or evaluator

Change-Id: I50ce5223310fe87e3382c446e2d36d93ae38a8fe
 2014-07-15 17:39:48 +00:00
Amith Yamasani
4d922e6f74 Merge "Revert some new APIs for restrictions provider" into lmp-dev 2014-07-15 16:04:58 +00:00
Amith Yamasani
5470bc184a Revert some new APIs for restrictions provider 
Simplify back to being a broadcast receiver and add an extra to
indicate that a new request is desired vs. returning a pending
response from before.

Change-Id: Iafd16ed98293a2cc09006d2cce097fc3d590bbe2
 2014-07-15 09:43:20 -07:00
George Mount
01e9a97fe6 Don't lose ActivityOptions during orientation change. 
Bug 16188506

Change-Id: I056153e6ddbaf328dd65b8b27a91ae773c33ea22
 2014-07-15 14:38:28 +00:00
Wei Wang
890b46a0d5 Remove MR2 BLE Advertising hidden API from L codebase (1/2). 
Change-Id: I78bb8b89de56bddb7422da1d1d4468c88a68ea11
 2014-07-14 19:31:49 -07:00
Jeff Sharkey
b45b2d55fc am 9b4ec01d: am 384b8a0a: Merge "Public API for PackageInstaller!" into lmp-dev 
* commit '9b4ec01d60736513ec11ab64b52f49d2d9ce68c7':
  Public API for PackageInstaller!
 2014-07-15 13:41:46 +00:00
Jeff Sharkey
4e567c8675 am 384b8a0a: Merge "Public API for PackageInstaller!" into lmp-dev 
* commit '384b8a0a08ecd33cdd08b4683c7c045c40d33fd9':
  Public API for PackageInstaller!
 2014-07-15 13:34:15 +00:00
Amith Yamasani
63816ece35 am 82d78b21: Merge "Introduce a public intent for launching Home settings" into lmp-dev 
* commit '82d78b21c75ec146e1206723c2996e5be1589f6d':
  Introduce a public intent for launching Home settings
 2014-07-15 02:31:55 +00:00
Jeff Sharkey
69ea974f17 Merge "Public API for PackageInstaller!" into lmp-dev 2014-07-15 00:41:06 +00:00
Jeff Sharkey
6c833e07a0 Public API for PackageInstaller! 
Flesh out documentation and finalize first cut of API.  Also surface
installLocation and splitNames through PackageInfo.

Bug: 14975160, 15348430
Change-Id: Ic27696d20ed06e508aa3526218e9cb20835af6a0
 2014-07-14 23:06:52 -07:00
Amith Yamasani
b99a90227a Merge "Introduce a public intent for launching Home settings" into lmp-dev 2014-07-15 00:22:01 +00:00
Amith Yamasani
eb7b94a388 Introduce a public intent for launching Home settings 
Bug: 16303152
Change-Id: I47e4461ae246aae7e31c8e06ca9370d6f04f61b4
 2014-07-14 18:02:08 -07:00
Ying Wang
749bd5d322 Fix docs build. 
Change-Id: I03b87aedcd5aedd8be665aa480fdeae8eafbde0e
 2014-07-14 23:21:52 -07:00
Ying Wang
af8cf374f7 Fix build. 
Change-Id: Ibb12a50823c6e1ea396a3f3dbf3d3b83ab762dac
 2014-07-14 20:36:08 -07:00
Amith Yamasani
a0c1d15174 am 9dda3c07: am 82d78b21: Merge "Introduce a public intent for launching Home settings" into lmp-dev 
* commit '9dda3c0728bcf2276ce9fdb726c427450e0a87b0':
  Introduce a public intent for launching Home settings
 2014-07-15 02:35:46 +00:00
Jay Civelli
915eade5dc Merge "Add new intent to prompt user for their device credential." 2014-07-15 00:22:01 +00:00
Jay Civelli
42feda4229 Add new intent to prompt user for their device credential. 
Change-Id: I152c5efda7186d59f63c341b046896c65e37de1b
 2014-07-14 18:08:04 -07:00
Aravind Akella
c067440dea am badd6789: Merge "Add PackageManager feature strings for relative humidity and temperature sensors." into lmp-dev 
* commit 'badd67890c16d26d15f88950cb7de0ce6bd1818d':
  Add PackageManager feature strings for relative humidity and temperature sensors.
 2014-07-14 23:40:01 +00:00
Santos Cordon
33a90b121f am ca95854d: Merge "Implement multi-SIM capabilities (1/6) [DO NOT MERGE]" into lmp-dev 
* commit 'ca95854d7402d7801364f7244a6d0b6f8e1c7845':
  Implement multi-SIM capabilities (1/6) [DO NOT MERGE]
 2014-07-14 23:30:25 +00:00
Alan Viverette
896e20ef5a am a3e345b5: Add window elevation for dialogs, clean up surface insets API 
* commit 'a3e345b5cfaf923ca77831d508ed7bc2c74c3cd4':
  Add window elevation for dialogs, clean up surface insets API
 2014-07-14 23:25:58 +00:00
Ruben Brunk
ecc15fca80 am feec2391: camera2: Update shader scaling matrix for legacy mode. 
* commit 'feec2391ab619307d92194ce23fd8a5ab8259272':
  camera2: Update shader scaling matrix for legacy mode.
 2014-07-14 23:15:48 +00:00
Christopher Tate
3470903821 am 2b3009ab: Merge "Add Context.getNoBackupFilesDir()" into lmp-dev 
* commit '2b3009abdab2c75de4f19787237e94310a004aee':
  Add Context.getNoBackupFilesDir()
 2014-07-14 23:15:39 +00:00
Jason Monk
061c80dbdc am fdf5aba7: Merge "Add missing lock task API" into lmp-dev 
* commit 'fdf5aba7fa80d59d017e8ea73233ff53392110b5':
  Add missing lock task API
 2014-07-14 23:15:08 +00:00
Alan Viverette
49a22e8202 Add window elevation for dialogs, clean up surface insets API 
BUG: 13211941
Change-Id: I9d605d0b2fb24f9bf8e73fbecd520b6b52ae5751
 2014-07-14 23:13:28 +00:00
Ruben Brunk
28c49c9d20 camera2: Update shader scaling matrix for legacy mode. 
Bug: 15116722
Change-Id: Idaa4311dfd027b2d2b8ea5e2c6cba2da5779d753
 2014-07-14 22:57:07 +00:00
RoboErik
dd4bc240e0 am 1600b7d8: Merge changes I51f2e466,I5b67cb3e into lmp-dev 
* commit '1600b7d81aa2e339aff715758e52f0e4cb1a12a7':
  Make PlaybackState immutable with a builder
  Add API to set a default session in Activity
 2014-07-14 22:25:02 +00:00
Dake Gu
0bd23aeaa2 am ab8005c1: Merge "ActivityTransition: restore callee activity shared element position" into lmp-dev 
* commit 'ab8005c15ede165822b94975f9ad4b6de52fe683':
  ActivityTransition: restore callee activity shared element position
 2014-07-14 22:24:43 +00:00
dcashman
e3bd1ab5bf am 1a18a06e: Merge "Initial KeySet API." into lmp-dev 
* commit '1a18a06eaa0cfcfcad4b63d9d4186735b4c6d281':
  Initial KeySet API.
 2014-07-14 21:39:22 +00:00
Jeff Sharkey
f41b425383 am 5c6079a2: Merge "Pass install result message; path selection." into lmp-dev 
* commit '5c6079a245d2e909327c639841b50e57dc2a39cc':
  Pass install result message; path selection.
 2014-07-14 21:39:11 +00:00
Alan Viverette
ebb8d70f1f am 52a2f72e: DO NOT MERGE Remove sub-position scroller 
* commit '52a2f72ee2c188540fa1242a38bb9cf77b0e674a':
  DO NOT MERGE Remove sub-position scroller
 2014-07-14 21:39:01 +00:00
Svet Ganov
26d6b22db9 am cd24476f: Correct printer extra constant value. 
* commit 'cd24476ffa314eb3b5589c1e7800929f14db86f9':
  Correct printer extra constant value.
 2014-07-14 21:38:51 +00:00
Yorke Lee
3613519595 am 07f62944: Merge "Add TRANSCRIPTION column to Calls table" into lmp-dev 
* commit '07f62944716836a696e46f903950a63bbba9a47e':
  Add TRANSCRIPTION column to Calls table
 2014-07-14 21:38:46 +00:00
Ed Heyl
a50cd8d426 reconcile aosp (f908b61abf) after branching. Please do not merge. 
Change-Id: Icd3f2c31aca8c9888c81da27eaeaffed07ec9820
 2014-07-14 23:42:04 -07:00
Narayan Kamath
537274103c Merge "Fix multiArch parsing for ApkLite." into lmp-dev 2014-07-14 21:05:13 +00:00
Narayan Kamath
a8755a8407 Fix multiArch parsing for ApkLite. 
Two separate issues :
- We were not parcelling the value at all.
- We were looking for it in the wrong manifest attribute.

Note that this change has no observable effect on installs (which
is probably why it wasn't caught so far). This code path is only
used in FileInstallArgs.copyApk (where multiArch was effectively
false before this change) but the package manager extracts shared
libs *again* inside scanPackageLI where this was being done
correctly since the value there came from a "full" package
parse, and not a "lite" package parse.

Change-Id: I54c3efcf8f57e6970f8fbde8cd1f57d487b13114
 2014-07-15 16:47:27 +01:00
Jeff Brown
295f679ce0 am bb1ecd35: Merge changes I3c19e008,I2c7c6013,I5cfd37d9 into lmp-dev 
* commit 'bb1ecd35760b9e9ddc030a73d014ae9b11df17ac':
  Update media session test application for new media router.
  Initial draft of new MediaRouter APIs.
  Delete first draft of media routing APIs.
 2014-07-14 21:01:13 +00:00
Alexandra Gherghina
d858ac241a am 895cf4b7: Merge "Adds hidden startActivityForResultAsUser APIs" into lmp-dev 
* commit '895cf4b76e7d697229bc0589c7646d1be815b24a':
  Adds hidden startActivityForResultAsUser APIs
 2014-07-14 21:01:07 +00:00
Eino-Ville Talvala
ea60143852 am eecbafe8: Deprecate android.hardware.Camera 
* commit 'eecbafe85de924a1ed6c4c3ecfcfc2353a9c6fcf':
  Deprecate android.hardware.Camera
 2014-07-14 21:00:46 +00:00
Amith Yamasani
6b792a5d78 am 45316d2e: Improvements to Restrictions API 
* commit '45316d2ebf8b4fb198d68c74c5bb94e9431bcc3d':
  Improvements to Restrictions API
 2014-07-14 19:18:49 +00:00
Narayan Kamath
1692b42f26 am beaf9be6: Merge "Unhide Build.SUPPORTED_ABIS and friends." 
* commit 'beaf9be6bab5dbbc96929c5b66847e7b49fcda12':
  Unhide Build.SUPPORTED_ABIS and friends.
 2014-07-14 19:18:35 +00:00
Jeff Sharkey
a54bfb0963 am 847712f4: Merge "Package installation listener events." 
* commit '847712f4e7a4614bd350a85b3d60113db002255a':
  Package installation listener events.
 2014-07-14 19:18:28 +00:00
Alan Viverette
9dbf31379b am f2e70fee: Merge "Specify light and shadow properties in theme" 
* commit 'f2e70fee223f08ce8f986f5d1b6dbeb018561e84':
  Specify light and shadow properties in theme
 2014-07-14 19:18:04 +00:00
Adam Powell
da41e890da am eb61f0f4: Updated "with-default" layout added for ResolverActivity 
* commit 'eb61f0f47e0be8361cd6269281908e303152dac9':
  Updated "with-default" layout added for ResolverActivity
 2014-07-14 19:17:56 +00:00
Jeff Sharkey
75d0fb51a2 am b525f6c2: Merge "Surface detailed error messages from PMS." 
* commit 'b525f6c22425524da82b8fbaf4581ef7acd78844':
  Surface detailed error messages from PMS.
 2014-07-14 19:17:52 +00:00