smain@google.com
ec82d3e76e
update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d
...
am: 9de1d192af
* commit '9de1d192af5761dec4e58837690febc6385874b4':
update sdk/ link to studio/
Change-Id: I3184c8b697fe96162cb87c17bcf85fc6375127d9
2016-05-18 22:59:45 +00:00
Bert McMeen
c4e18f5a38
Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs am: 58fdf82ab9
...
am: 3fb62d859f
* commit '3fb62d859f2c3ed0b06dd3d6f7183c838c829c2b':
docs: Update to md5 and sha-1 values for Javadoc download
Change-Id: I3ad08bb522e3c1ab2fefd2cf7884d69d82f5d394
2016-05-18 22:59:36 +00:00
Android Build Merger (Role)
7dac5c55b3
Merge "Merge "Two phases to set the password for disk encryption" into nyc-dev am: 56a9395aeb am: 3ddb6d5fe2" into nyc-mr1-dev-plus-aosp
2016-05-18 22:55:18 +00:00
Paul Crowley
47eb5a7d18
Merge "Two phases to set the password for disk encryption" into nyc-dev am: 56a9395aeb
...
am: 3ddb6d5fe2
* commit '3ddb6d5fe2ef2c86a70af25ce79849e76efd5674':
Two phases to set the password for disk encryption
Change-Id: Icc4ede9459833b3c8879514b15fd3b5aba9be812
2016-05-18 22:54:54 +00:00
smain@google.com
9de1d192af
update sdk/ link to studio/ am: 04de2d285e
...
am: 2e28ebfc1d
* commit '2e28ebfc1d4ef357968923fc763d1f87ea389ef6':
update sdk/ link to studio/
Change-Id: I2180d895901a935aa0ebf46cdbfc7b7ab8d2b23e
2016-05-18 22:54:47 +00:00
Bert McMeen
3fb62d859f
Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs
...
am: 58fdf82ab9
* commit '58fdf82ab9c21fb6fd3d1d64e1d2c13abb670ba1':
docs: Update to md5 and sha-1 values for Javadoc download
Change-Id: I0a158cce412a6973b607c2002a490ffa37e72f59
2016-05-18 22:54:43 +00:00
Paul Crowley
02826bb36b
Merge "Two phases to set the password for disk encryption" into nyc-dev am: 56a9395aeb
...
am: 2a1076339e
* commit '2a1076339ecb7ba9b7c8829bb3c3285df29a67e3':
Two phases to set the password for disk encryption
Change-Id: I884dae66b133d8b9312a7793d415964e13ed8105
2016-05-18 22:54:43 +00:00
Paul Crowley
3ddb6d5fe2
Merge "Two phases to set the password for disk encryption" into nyc-dev
...
am: 56a9395aeb
* commit '56a9395aeb198e0a7db5e9666cc81ba7ce5f8e0d':
Two phases to set the password for disk encryption
Change-Id: Ieac13a4c2775e3d2bc5463f4161c6e8b151bf6c9
2016-05-18 22:50:37 +00:00
smain@google.com
2e28ebfc1d
update sdk/ link to studio/
...
am: 04de2d285e
* commit '04de2d285e6e264f5a7a84de205a30571fcc1c9e':
update sdk/ link to studio/
Change-Id: I9fbf52b2802c4ae33bfef289c6fceb8484dd8014
2016-05-18 22:50:05 +00:00
Paul Crowley
2a1076339e
Merge "Two phases to set the password for disk encryption" into nyc-dev
...
am: 56a9395aeb
* commit '56a9395aeb198e0a7db5e9666cc81ba7ce5f8e0d':
Two phases to set the password for disk encryption
Change-Id: I76b3b1351ea85d8a5e42da523f57a291b3a1b0d9
2016-05-18 22:50:02 +00:00
Andreas Gampe
a8a58ffdee
Frameworks/base: Optimize LoadedApk
...
Preallocate storage lists and avoid TextUtils and its string
builder for a common code path.
Optimize list join helper to not have a check in the loop.
Bug: 28801010
Change-Id: Iafc582031f973d718252b34bcda6405a77425628
2016-05-18 15:48:12 -07:00
Bert McMeen
58fdf82ab9
Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs
2016-05-18 22:44:54 +00:00
Andreas Gampe
4c8e542f68
Frameworks/base: Add more systrace points
...
Add more systrace points for application startup.
Bug: 28625993
Change-Id: I76dca9e842fb43f1b85981ef94582074d31528c8
2016-05-18 15:43:45 -07:00
Paul Crowley
56a9395aeb
Merge "Two phases to set the password for disk encryption" into nyc-dev
2016-05-18 22:40:09 +00:00
smain@google.com
04de2d285e
update sdk/ link to studio/
...
Change-Id: I960fed90fc2c44d5c3405d330bc5a474ce9a13c5
2016-05-18 15:28:59 -07:00
smain@google.com
643a9a79cf
Update app context in code snippet bug: 28842396 am: 056df25179 am: 0fc19538cf am: cca8eba82d am: d24ad86909
...
am: e1a486a4c1
* commit 'e1a486a4c1fe3b32140cc69cb35a48d03368af21':
Change-Id: Ic421775e4bfb22f0b8adbf56dddbaded0276ab7d
2016-05-18 22:23:40 +00:00
smain@google.com
441247b832
Update app context in code snippet bug: 28842396 am: 056df25179 am: 0fc19538cf am: cca8eba82d am: d24ad86909
...
am: 664446a34c
* commit '664446a34c1887c743060c8caa406a97923c483d':
Update app context in code snippet bug: 28842396
Change-Id: Id6cb8c5d2da687dc4a75a1b401880d1ac03b05db
2016-05-18 22:18:35 +00:00
Android Build Merger (Role)
6ee6ba515a
Merge "Merge "Fixes for ending PiP animation." into nyc-dev am: bc9edc7ccb am: cd1a9642e8" into nyc-mr1-dev-plus-aosp
2016-05-18 22:13:31 +00:00
Android Build Merger (Role)
80a01d8d6d
Merge "Merge "Correct PiP inset adjustment." into nyc-dev am: 54a3dd53fe am: beda350d78" into nyc-mr1-dev-plus-aosp
2016-05-18 22:13:19 +00:00
Robert Carr
962e267d8c
Merge "Fixes for ending PiP animation." into nyc-dev am: bc9edc7ccb
...
am: cd1a9642e8
* commit 'cd1a9642e8a5787ef1ab822b6b7a4c4370cd93b7':
Fixes for ending PiP animation.
Change-Id: Ied6460cf354628c348f5503c2b63eb2b4ef419fb
2016-05-18 22:12:52 +00:00
Robert Carr
715994bf82
Merge "Correct PiP inset adjustment." into nyc-dev am: 54a3dd53fe
...
am: beda350d78
* commit 'beda350d785f25456ce31363203fef3a3e694712':
Correct PiP inset adjustment.
Change-Id: I2b357ac4a80b86ac2dd4c8f46d0aad172624688e
2016-05-18 22:12:50 +00:00
smain@google.com
e1a486a4c1
Update app context in code snippet bug: 28842396 am: 056df25179 am: 0fc19538cf am: cca8eba82d
...
am: d24ad86909
* commit 'd24ad8690968c532d3b9d2109309ae19cc995d3c':
Update app context in code snippet bug: 28842396
Change-Id: I0efcef2cddb7e372347c8665d02093c3ed22c1ed
2016-05-18 22:11:38 +00:00
smain@google.com
664446a34c
Update app context in code snippet bug: 28842396 am: 056df25179 am: 0fc19538cf am: cca8eba82d
...
am: d24ad86909
* commit 'd24ad8690968c532d3b9d2109309ae19cc995d3c':
Update app context in code snippet bug: 28842396
Change-Id: Ib50337985494772510e4e754dd6884fe9b30ba8e
2016-05-18 22:11:35 +00:00
Robert Carr
3b0a049b11
Merge "Fixes for ending PiP animation." into nyc-dev am: bc9edc7ccb
...
am: 9782de1ffd
* commit '9782de1ffd344d1a8250b8ead4a13eee16c20cde':
Fixes for ending PiP animation.
Change-Id: I34acea654389eedd7d3b6f6e7ec2f239cccf2ae6
2016-05-18 22:11:10 +00:00
Robert Carr
0a669e6e98
Merge "Correct PiP inset adjustment." into nyc-dev am: 54a3dd53fe
...
am: 76ad440346
* commit '76ad440346ef6e87775403566aacf8d852a7c674':
Correct PiP inset adjustment.
Change-Id: I2aee2e94118884b9bb98876e55283b1a8783c8b0
2016-05-18 22:11:03 +00:00
Robert Carr
9782de1ffd
Merge "Fixes for ending PiP animation." into nyc-dev
...
am: bc9edc7ccb
* commit 'bc9edc7ccb4d876bfc5c706fbb64dab9a2768b52':
Fixes for ending PiP animation.
Change-Id: If885965536859bc2433d14d4993010871c171360
2016-05-18 22:05:30 +00:00
Robert Carr
cd1a9642e8
Merge "Fixes for ending PiP animation." into nyc-dev
...
am: bc9edc7ccb
* commit 'bc9edc7ccb4d876bfc5c706fbb64dab9a2768b52':
Fixes for ending PiP animation.
Change-Id: I58d62d0d0dd964264395b545bf4e3093a0ffaf88
2016-05-18 22:05:28 +00:00
Robert Carr
76ad440346
Merge "Correct PiP inset adjustment." into nyc-dev
...
am: 54a3dd53fe
* commit '54a3dd53fe6028db1f1c797ed6be12ccb6263ecf':
Correct PiP inset adjustment.
Change-Id: I7e9ad20b69c5bfc99828537535bf83e6c864ffeb
2016-05-18 22:05:26 +00:00
Robert Carr
beda350d78
Merge "Correct PiP inset adjustment." into nyc-dev
...
am: 54a3dd53fe
* commit '54a3dd53fe6028db1f1c797ed6be12ccb6263ecf':
Correct PiP inset adjustment.
Change-Id: I4dd488abc3f9eb84a7c4fc198837f7bb715964b5
2016-05-18 22:05:23 +00:00
smain@google.com
d24ad86909
Update app context in code snippet bug: 28842396 am: 056df25179 am: 0fc19538cf
...
am: cca8eba82d
* commit 'cca8eba82d48888656d36aed8020fd3ecd738fdd':
Update app context in code snippet bug: 28842396
Change-Id: I04ef5aeac32a526028e71ed71bcdf39920cc0c4f
2016-05-18 22:00:21 +00:00
TreeHugger Robot
bc9edc7ccb
Merge "Fixes for ending PiP animation." into nyc-dev
2016-05-18 21:57:23 +00:00
TreeHugger Robot
54a3dd53fe
Merge "Correct PiP inset adjustment." into nyc-dev
2016-05-18 21:57:04 +00:00
Android Build Merger (Role)
185bfbb635
Merge "Merge "Mark occluded home stack as invisible." into nyc-dev am: 32b54f2e42 am: 98fdcf308f" into nyc-mr1-dev-plus-aosp
2016-05-18 21:56:54 +00:00
Android Build Merger (Role)
8386eae2a1
Merge "Merge "Make fake libart for misbehaving apps be loaded." am: 4bc3d32b15 am: 8f578530a9 -s ours am: 67f3a19e9a" into nyc-mr1-dev-plus-aosp
2016-05-18 21:56:43 +00:00
Winson Chung
b371da239c
Merge "Mark occluded home stack as invisible." into nyc-dev am: 32b54f2e42
...
am: 98fdcf308f
* commit '98fdcf308f8cc609e2b7c919d308379d1164c85e':
Mark occluded home stack as invisible.
Change-Id: If6b7f4c0f750135125777f41ba5d2b76bea03640
2016-05-18 21:56:14 +00:00
Alex Light
52dcb22b81
Merge "Make fake libart for misbehaving apps be loaded." am: 4bc3d32b15 am: 8f578530a9 -s ours
...
am: 67f3a19e9a
* commit '67f3a19e9a29c4417eaeed42bd99fb079e096e9c':
Make fake libart for misbehaving apps be loaded.
Change-Id: I35845a4b62ff4111680f0b1ffc3cc47717d23ab9
2016-05-18 21:56:12 +00:00
Winson Chung
ea9220988e
Merge "Mark occluded home stack as invisible." into nyc-dev am: 32b54f2e42
...
am: 6e2ee9e382
* commit '6e2ee9e382dd86340d5242fe04a623b9cda10f6e':
Mark occluded home stack as invisible.
Change-Id: I1762cf46b675fe2c5151332a53139e95d676cb01
2016-05-18 21:56:10 +00:00
smain@google.com
cca8eba82d
Update app context in code snippet bug: 28842396 am: 056df25179
...
am: 0fc19538cf
* commit '0fc19538cf9e166fe0ccf511c3f6d18b23b9fd90':
Update app context in code snippet bug: 28842396
Change-Id: I9212c98b926568f2516fd34fb3ba376029bb366b
2016-05-18 21:55:11 +00:00
smain@google.com
0fc19538cf
Update app context in code snippet bug: 28842396
...
am: 056df25179
* commit '056df25179e2a6621f9abeb5cdf749387a489751':
Update app context in code snippet bug: 28842396
Change-Id: I302124bb72a8162dbc0c7b1fa96c14657a86c97c
2016-05-18 21:51:50 +00:00
Winson
98fdcf308f
Merge "Mark occluded home stack as invisible." into nyc-dev
...
am: 32b54f2e42
* commit '32b54f2e42c4ff793c418c29c0ce9ef0be2a4a16':
Mark occluded home stack as invisible.
Change-Id: Iae4279835f345b2b294acca20760634ba031f0bd
2016-05-18 21:50:44 +00:00
Winson
6e2ee9e382
Merge "Mark occluded home stack as invisible." into nyc-dev
...
am: 32b54f2e42
* commit '32b54f2e42c4ff793c418c29c0ce9ef0be2a4a16':
Mark occluded home stack as invisible.
Change-Id: Iaa68bb7c93ffd8bcfc9af3e66fd7fced7787a671
2016-05-18 21:49:17 +00:00
Winson Chung
32b54f2e42
Merge "Mark occluded home stack as invisible." into nyc-dev
2016-05-18 21:42:57 +00:00
Alex Light
67f3a19e9a
Merge "Make fake libart for misbehaving apps be loaded." am: 4bc3d32b15
...
am: 8f578530a9 -s ours
* commit '8f578530a9e2c249ccdd881933d48c205bf5d374':
Make fake libart for misbehaving apps be loaded.
Change-Id: I1685e8fabf23d6fe1709fb34cafe20a5cc2625e4
2016-05-18 21:41:43 +00:00
smain@google.com
056df25179
Update app context in code snippet
...
bug: 28842396
Change-Id: I306ba2d3f7ccb1f547caa46e038c1d3faaccab26
2016-05-18 14:35:51 -07:00
Alex Light
8f578530a9
Merge "Make fake libart for misbehaving apps be loaded."
...
am: 4bc3d32b15
* commit '4bc3d32b15cdcae7685722e7a20007c7aa9ae949':
Make fake libart for misbehaving apps be loaded.
Change-Id: Ia256fdb964f69c029c3b1e8e10ff396f79048cb4
2016-05-18 21:13:23 +00:00
Chong Zhang
b5dcf2f7f0
Merge "Request a traversal when a saved surface gets redrawn" into nyc-dev am: ff8ceadfc8
...
am: e5f15f1b34
* commit 'e5f15f1b34931fb28937646599e7e66b7cb61ed1':
Change-Id: I0b4837dc3e7b10d6f345b54079aefa8a6bdf3bd8
2016-05-18 21:07:35 +00:00
Alex Light
4bc3d32b15
Merge "Make fake libart for misbehaving apps be loaded."
2016-05-18 21:05:42 +00:00
Chong Zhang
0cfcd14e7b
Merge "Request a traversal when a saved surface gets redrawn" into nyc-dev am: ff8ceadfc8
...
am: c5bdda2236
* commit 'c5bdda22367884965b16dcfbb98cf6b2f6cddd1d':
Request a traversal when a saved surface gets redrawn
Change-Id: Ie38198dca921a06b7124c195ae8f77479e8fdfd6
2016-05-18 21:04:39 +00:00
Amith Yamasani
1ab19ea6e6
Merge "Retail mode flag and some clients for it" into nyc-mr1-dev
...
am: dbf0dbd8c2
* commit 'dbf0dbd8c216e801b3d95f83d13ae05c1ba0ea39':
Retail mode flag and some clients for it
Change-Id: I5f9e7c49759154925c6f20ab3fd647d84259b1bb
2016-05-18 21:01:49 +00:00
Chong Zhang
c5bdda2236
Merge "Request a traversal when a saved surface gets redrawn" into nyc-dev
...
am: ff8ceadfc8
* commit 'ff8ceadfc8c5f03da57420ad93a698cb0a57fcd9':
Request a traversal when a saved surface gets redrawn
Change-Id: I5cd93f39d2cf2b11e405f4d9f05ecb6bc2040267
2016-05-18 21:01:44 +00:00