Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

5235 Commits

Author SHA1 Message Date
Christopher Tate
1d94907c77 am dff55807: am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev 
* commit 'dff55807117f515ff3f8878ed268a20c1fb9e4a5':
  Adjust wallpaper-restore acceptance criteria
 2014-12-04 21:23:43 +00:00
Christopher Tate
dff5580711 am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev 
* commit 'e808d2df764ca19c94bdaf5f9b5cd9a311046d98':
  Adjust wallpaper-restore acceptance criteria
 2014-12-04 21:17:37 +00:00
Christopher Tate
758f45217d Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev 2014-12-03 23:09:34 +00:00
Winson Chung
3b8887d540 am fee5e3d3: am 50511096: am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 
* commit 'fee5e3d32a26c3ac2136e37cad15fd9cc41066db':
  Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
 2014-12-03 21:50:36 +00:00
Dianne Hackborn
98866d1179 am b46e9da6: am bedd1744: am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev 
* commit 'b46e9da64c51bcbfdd21b8e18850064eeb50d930':
  Work on issue #18572506: AppOps in-memory state is invalid after...
 2014-12-03 21:50:10 +00:00
Christopher Tate
31f25696d9 Adjust wallpaper-restore acceptance criteria 
Previously the dimension check had implicit orientation sensitivity.
We now make sure to compare the candidate image's width to the smallest
screen dimension for acceptance purposes; this fixes cases when we would
e.g. get a restored image of (1680x2560) but believe that we needed it
to have a max width of 2048, even though it had originated on that same
device -- due to current-orientation issues.

Bug 18448052

Change-Id: I64ca6a4ed91ce1ccc04f5a9a6851e5cfe511b7c7
 2014-12-03 13:07:24 -08:00
Winson Chung
fee5e3d32a am 50511096: am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 
* commit '50511096998ffff4fa5c001e46b056201fb0b892':
  Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
 2014-12-03 20:42:45 +00:00
Dianne Hackborn
b46e9da64c am bedd1744: am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev 
* commit 'bedd1744b2afa0ede3ab7ac38a0e4a2111ed53bf':
  Work on issue #18572506: AppOps in-memory state is invalid after...
 2014-12-03 20:42:17 +00:00
Winson Chung
de9848c641 Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 2014-12-03 18:10:38 +00:00
Dianne Hackborn
ef44c0514d Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev 2014-12-03 18:03:27 +00:00
Dianne Hackborn
7b7c58b384 Work on issue #18572506: AppOps in-memory state is invalid after... 
...uninstalling updates to a system app

Things seem to be working fine, however we were not as aggressive at
writing out the current state in this case as we probably should be.

Also introduce more features to the appops command, which are useful
for testing this.

Change-Id: I177a9cc0e16e98b76fee0d052d742e06842bb3f9
 2014-12-03 10:01:14 -08:00
George Mount
699a77e553 am a3a53251: am 24fac506: am 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev 
* commit 'a3a53251f1dfdd3620bfa9b0a8f350a9867826d9':
  Keep snapshot order matching the shared elements.
 2014-12-03 17:18:38 +00:00
George Mount
a3a53251f1 am 24fac506: am 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev 
* commit '24fac506f0204433aa3d2314d3ac7f909b6eb67a':
  Keep snapshot order matching the shared elements.
 2014-12-03 07:56:00 +00:00
Chris Wren
83cb9cad31 am 723bce8a: am 47a5cb12: am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes" 
* commit '723bce8a0d4fa900ca4344c03e5e82b5881fcf19':
  Keep deleteIntent when copying Notification attributes
 2014-12-03 00:30:44 +00:00
George Mount
561261d444 Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev 2014-12-03 00:13:28 +00:00
Winson Chung
740c3ac782 Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345) 
Add a listener to listen for changes in the Task stacks to preload thumbnails from the
system.  In addition, reduce the amount of synchronous work done in activity creation
and first measure/layout passes.

Change-Id: I8bd9155d7a05e89c190a20429acff69a17808208
 2014-12-02 15:34:20 -08:00
Chris Wren
723bce8a0d am 47a5cb12: am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes" 
* commit '47a5cb122ab495e8420c46d8f324bddcd38920af':
  Keep deleteIntent when copying Notification attributes
 2014-12-02 22:45:22 +00:00
George Mount
92692c0284 Keep snapshot order matching the shared elements. 
Bug 18578796

When no snapshot was created, we weren't adding anything to
the snapshot list. When a snapshot is not created, we should
add an null snapshot to the snapshot list to keep them in
order.

Change-Id: I522e485163229230037dcdd635b83cff800df28f
 2014-12-02 14:31:31 -08:00
Chris Wren
acd01ff076 Merge "Keep deleteIntent when copying Notification attributes" 2014-12-02 22:31:09 +00:00
Dianne Hackborn
6acccd524d am 1c2f6ca1: am 2f58bab7: am 221b545c: Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev 
* commit '1c2f6ca13672c5d3c33e7d18afa7b92b9a8f6d64':
  Fix issue #18510117: Returning from an activity started with...
 2014-12-02 19:45:34 +00:00
Dianne Hackborn
1c2f6ca136 am 2f58bab7: am 221b545c: Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev 
* commit '2f58bab7b026fbe010aad8ae777f3abda295dc66':
  Fix issue #18510117: Returning from an activity started with...
 2014-12-02 19:40:10 +00:00
Dianne Hackborn
221b545cda Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev 2014-12-02 19:22:07 +00:00
Dianne Hackborn
a01a0faebf Fix issue #18510117: Returning from an activity started with... 
...startActivityForResult causes SecurityExpcetion

The ReferrerIntent hack was becoming visible to apps, which caused
a mismatch between marshalling/unmarshalling of the IPC call.

Change-Id: Ibcb788327b5bae4426efc826551799fa87d1cbaa
 2014-12-02 10:33:14 -08:00
Paul Crowley
ef370c0ca0 am 05f23d97: am f57d9dcb: am fbeeac82: Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev 
* commit '05f23d974bdfc5fb221f0bfa5bef4e9c915e52d9':
  Add a tag to separate paragraphs in Javadoc
 2014-12-02 15:04:15 +00:00
Paul Crowley
05f23d974b am f57d9dcb: am fbeeac82: Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev 
* commit 'f57d9dcbc7ecbae8bc8f821532a508c22bc3327f':
  Add a tag to separate paragraphs in Javadoc
 2014-12-02 14:57:31 +00:00
Paul Crowley
fbeeac8266 Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev 2014-12-02 14:44:27 +00:00
Paul Crowley
2934b266e5 Add a tag to separate paragraphs in Javadoc 
Bug: 18571794
Change-Id: Icb9bdb87415d85cdbf790224e40abbf99a441456
 2014-12-02 11:21:13 +00:00
Alan Viverette
643b4aa61d am 02cd927d: am 53644fb5: am 015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev 
* commit '02cd927dffa24479a0ca29b40ead7b28f9e60a7c':
  Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
 2014-12-01 20:07:27 +00:00
Alan Viverette
02cd927dff am 53644fb5: am 015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev 
* commit '53644fb5acd394b875723b6483215ba837f8e6c0':
  Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
 2014-12-01 20:00:49 +00:00
Craig Mautner
8bbcd72c8b am b97f7190: am fac55682: am 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed" 
* commit 'b97f719036b15c81aeb561ae0d2b4da68e7a06e8':
  [ActivityManager] Avoid system server crash due to package removed
 2014-12-01 05:33:32 +00:00
Craig Mautner
b97f719036 am fac55682: am 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed" 
* commit 'fac55682148e6d9c6b4e24769369e2b76ab018ac':
  [ActivityManager] Avoid system server crash due to package removed
 2014-12-01 05:26:47 +00:00
Craig Mautner
208bd91b24 Merge "[ActivityManager] Avoid system server crash due to package removed" 2014-12-01 00:11:52 +00:00
Alan Viverette
d26276d9e3 Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked 
BUG: 18541882
Change-Id: I2ba4611e08ba08667ef5ee4fb556d1c9075ca6d2
 2014-11-26 16:08:58 -08:00
Paul Crowley
5ff0e5fb6b am 0d122e26: am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 
* commit '0d122e265c52ef25dbad652378b3a5e51a86f041':
  Add flag for wiping factory reset protection data.
 2014-11-26 12:09:51 +00:00
Paul Crowley
0d122e265c am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 
* commit 'ba94fd5e6c243c6256a1627a41aaab52a74747d6':
  Add flag for wiping factory reset protection data.
 2014-11-26 12:02:37 +00:00
Paul Crowley
a7e87acb24 Add flag for wiping factory reset protection data. 
Bug: 18366448
Change-Id: If8904888a6bf8611d34647e6d65d2347d824dbb3
 2014-11-25 20:48:41 +00:00
Adrian Roos
e1d84dd914 am 9a4d0257: am 520d20c1: am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 
* commit '9a4d0257beadf53c706afbcb4abc76c17a44ff00':
  Fix DPM.resetPassword("")
 2014-11-25 15:15:35 +00:00
Christoph Studer
18032a083a am fe6d4f09: am 30646d87: am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev 
* commit 'fe6d4f094d2441314bb31fec10b520f80aeb481e':
  Fix MediaStyle API comments
 2014-11-25 15:15:31 +00:00
Adrian Roos
9a4d0257be am 520d20c1: am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 
* commit '520d20c1a8c2fbd0d6b7fdc19415167a6f45c866':
  Fix DPM.resetPassword("")
 2014-11-25 15:09:24 +00:00
Christoph Studer
fe6d4f094d am 30646d87: am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev 
* commit '30646d87f240cd17917ad6d1ae83306d284b58b5':
  Fix MediaStyle API comments
 2014-11-25 15:09:18 +00:00
Wink Saville
5c11e41b1a am b4c54109: am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit 'b4c5410987a6657b71fb0b86e1ef8337628241dc':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:13:01 +00:00
Wink Saville
b4c5410987 am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit '4f1cce63061976490e2e2cfc4085e1634d3a02de':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:06:09 +00:00
Adrian Roos
702d9e31b1 Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 2014-11-24 16:02:11 +00:00
Christoph Studer
e935fe918e Fix MediaStyle API comments 
Bug: 17805819
Change-Id: Ie45a43d7ae99304d635ce75aeb32a6d4d4e3e57d
 2014-11-24 14:18:06 +01:00
Robin Lee
0d5ccb7378 Ensure that private key is PKCS#8-encoded 
getEncoded() is not requred to return a PKCS#8-encoded result.

Bug: 15065444
Change-Id: I1278ff9ffffe5887f149bae9288a174beed5f86a
 2014-11-24 10:10:39 +00:00
Wink Saville
d09c4cad65 Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
 2014-11-22 10:08:16 -08:00
Amith Yamasani
9d4e6a8355 am 1f26bf6b: am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev 
* commit '1f26bf6bfd683b840f688b41d285fd9c942e6ed5':
  Different messages when wiping user and not device
 2014-11-22 00:00:01 +00:00
Jeff Brown
fd72097736 am 4c9041cf: am 1ac13e02: am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev 
* commit '4c9041cf837cda13c749b148661d18c3fab0fbd6':
  Support keeping activities resumed while dozing.
 2014-11-21 23:13:49 +00:00
Amith Yamasani
1f26bf6bfd am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev 
* commit '108bdbc934d1e5fb77406d0267ab67f8736dfc57':
  Different messages when wiping user and not device
 2014-11-21 23:07:03 +00:00
Amith Yamasani
efb2df698a Merge "Different messages when wiping user and not device" into lmp-mr1-dev 2014-11-21 22:27:17 +00:00