Commit Graph

236259 Commits

Author SHA1 Message Date
Jeff Sharkey
12e2778307 Merge "Ask RingtonePlayer to open data for caching." into nyc-dev
am: b94f2df289

* commit 'b94f2df289f4289f1eca7206f3d1bcdd737e69a6':
  Ask RingtonePlayer to open data for caching.
2016-03-06 00:32:25 +00:00
Jeff Sharkey
b94f2df289 Merge "Ask RingtonePlayer to open data for caching." into nyc-dev 2016-03-06 00:29:01 +00:00
Jeff Sharkey
783ee0ca87 Ask RingtonePlayer to open data for caching.
When setting default ringtones, RingtoneManager now caches the
selected media for playback before the device is unlocked.  However,
this API hasn't historically required the caller to hold storage
permissions.

To keep this working, we attempt to delegate ringtone access over
through RingtonePlayer, which is what we do for playback.  However,
because we're caching the real ringtone bits now, we need to be much
more careful about the PFDs we're willing to return.  This change
requires that they be in external storage, and that they have the
ringtone/alarm/notification bit set.

Bug: 27366059
Change-Id: I59c2adc1d1250a3eac281f190f35a7cb3119967b
2016-03-05 17:23:32 -07:00
Jeff Sharkey
24219954ec Merge "Add AssetFileDescriptor to MediaExtractor." into nyc-dev
am: d6de3abed9

* commit 'd6de3abed92ae88154da731e6c0030b3a8d3d8ee':
  Add AssetFileDescriptor to MediaExtractor.
2016-03-05 23:15:10 +00:00
Jeff Sharkey
d6de3abed9 Merge "Add AssetFileDescriptor to MediaExtractor." into nyc-dev 2016-03-05 23:09:25 +00:00
Jeff Sharkey
a3c1c2297d Add AssetFileDescriptor to MediaExtractor.
Mirrors API on MediaPlayer.

Bug: 27506874
Change-Id: Ibc07cf8151c362ff7375b89e7a9044bef1d9e94d
2016-03-05 16:07:46 -07:00
Jeff Sharkey
e741feb79b Merge "Kick Bluetooth stack after user is unlocked." into nyc-dev
am: 3457871799

* commit '3457871799a81644711d7d3c302f0d34d2f2e591':
  Kick Bluetooth stack after user is unlocked.
2016-03-05 22:31:46 +00:00
Jeff Sharkey
3457871799 Merge "Kick Bluetooth stack after user is unlocked." into nyc-dev 2016-03-05 22:28:34 +00:00
Jeff Sharkey
aacb89e929 Kick Bluetooth stack after user is unlocked.
If Bluetooth was enabled at boot time, but the actual Bluetooth
package wasn't encryption aware, we need to kick off another enabled
pass once the user is unlocked.

Bug: 27326711
Change-Id: I511c4fd8567792e5bc4d49fa95929fd87edd0fbf
2016-03-05 15:00:52 -07:00
Jeff Sharkey
75ba62e11a Merge "Bluetooth should use Slog." into nyc-dev
am: 0e9e642bd9

* commit '0e9e642bd91ccfc82ffe3ad001a79f232636ba3d':
  Bluetooth should use Slog.
2016-03-05 21:34:08 +00:00
Jeff Sharkey
0e9e642bd9 Merge "Bluetooth should use Slog." into nyc-dev 2016-03-05 21:30:31 +00:00
Jeff Sharkey
67609c7570 Bluetooth should use Slog.
It's in the system process, so whatever it has to say is probably
important enough to stick around.

Change-Id: Iaeca99d6b9c4881c53ab89216b5128e345a5ff0f
2016-03-05 14:29:13 -07:00
Jeff Sharkey
713a95471f Merge "Move more PM calls to ParceledListSlice." into nyc-dev
am: fdc5ba8f43

* commit 'fdc5ba8f43e09cfbc8f5de0bf819b7684094953e':
  Move more PM calls to ParceledListSlice.
2016-03-05 21:16:43 +00:00
Jeff Sharkey
fdc5ba8f43 Merge "Move more PM calls to ParceledListSlice." into nyc-dev 2016-03-05 21:06:39 +00:00
Adam Lesinski
838917a010 Remove accidentally committed core dump file
am: c53244db5e

* commit 'c53244db5efb791d42b9b70c05ae8ed89b62c530':
  Remove accidentally committed core dump file
2016-03-05 07:46:55 +00:00
Adam Lesinski
c53244db5e Remove accidentally committed core dump file
Change-Id: I610abfbce62585c25e98b5c36ac9f496861e66e7
2016-03-04 22:30:32 -08:00
Adam Lesinski
27b3d553c6 Merge "AAPT2: Emit proper doclava comments in R.java" into nyc-dev
am: 5b37ef489a

* commit '5b37ef489a4090da3643041c8d0e6efa282ad8b6':
  AAPT2: Emit proper doclava comments in R.java
2016-03-05 05:44:02 +00:00
Adam Lesinski
3535da2076 Merge "AAPT2: Support --no-version-vectors" into nyc-dev
am: c7f8f45c69

* commit 'c7f8f45c69323228cc2ebf6a02028c0397f512ca':
  AAPT2: Support --no-version-vectors
2016-03-05 05:42:04 +00:00
Adam Lesinski
5b37ef489a Merge "AAPT2: Emit proper doclava comments in R.java" into nyc-dev 2016-03-05 05:39:01 +00:00
Adam Lesinski
c7f8f45c69 Merge "AAPT2: Support --no-version-vectors" into nyc-dev 2016-03-05 05:38:06 +00:00
Adam Lesinski
74605cd402 AAPT2: Emit proper doclava comments in R.java
Bug:25958912
Change-Id: I663f2eb5bd54e3c3288ce9bc186c928f0a014f93
2016-03-04 20:06:05 -08:00
Lifu Tang
7ae2c2cc5c Merge "Fixed the crash caused by type mismatch" into nyc-dev
am: f75ac97a5c

* commit 'f75ac97a5cac358f964af764a461af4db015d30e':
  Fixed the crash caused by type mismatch
2016-03-05 01:33:48 +00:00
Svet Ganov
8fdacd7faf Merge "Don\'t crash legacy apps with revoked "Draw over apps access"" into nyc-dev
am: 8a97307e5b

* commit '8a97307e5b2dd3888dfc3e75bff39a8ad151fe2a':
  Don't crash legacy apps with revoked "Draw over apps access"
2016-03-05 01:30:13 +00:00
Lifu Tang
f75ac97a5c Merge "Fixed the crash caused by type mismatch" into nyc-dev 2016-03-05 01:28:48 +00:00
Svetoslav Ganov
8a97307e5b Merge "Don't crash legacy apps with revoked "Draw over apps access"" into nyc-dev 2016-03-05 01:25:33 +00:00
Winson
6879dfa0cb Merge changes I5c414d67,I83d74c94 into nyc-dev
am: 6195e8af1e

* commit '6195e8af1ef057dd1b8114bb560f0d620fe2a148':
  Just return the task to the pool if it is not in the current stack.
  Refactoring to update stack in onResume.
2016-03-05 01:25:21 +00:00
Winson Chung
6195e8af1e Merge changes I5c414d67,I83d74c94 into nyc-dev
* changes:
  Just return the task to the pool if it is not in the current stack.
  Refactoring to update stack in onResume.
2016-03-05 01:21:02 +00:00
Adam Lesinski
626a69f345 AAPT2: Support --no-version-vectors
Change-Id: I8029b2f9e2f7ab8e37a49565f95210f47a7be609
2016-03-04 17:02:42 -08:00
Lifu Tang
235bbb1bb5 Fixed the crash caused by type mismatch
Bug: 27503442
Change-Id: I019afc1f3dd872c8f9d79e9b6e589a77acd0cddc
2016-03-04 17:01:06 -08:00
Winson
1d5ff7e71e Just return the task to the pool if it is not in the current stack.
Bug: 27467025
Change-Id: I5c414d674fb0db152b77c2025b4885d340e81880
2016-03-04 16:55:49 -08:00
Winson
8873754f66 Refactoring to update stack in onResume.
This CL fixes a long-standing issue in which Recents is not updated
correctly if it is not completely hidden and shown.  In particular, it
would cause animation issues when launching into a non-fullscreen
activity or if the user quickly toggles between recent tasks.  It
contains several fixes:

- The visual state in Recents is no longer reset until the activity is 
  fully hidden (onStop() is called), and the task stack state is saved 
  allowing us to return to the same initial state.  When restarting the 
  activity, we propagate whether the activity was hidden down the view 
  hierarchy, so that each task can decide whether to reset itself.
- When the recents activity is started, we now merge the new stack with
  the current stack instead of replacing it completely.  This unifies
  the logic when dismissing multi-window while Recents is open, and this
  CL fixes an issue with the merging where onStackTaskAdded() was called
  before the stack was updated with the new task.  As a result of this
  change, we can just rebind the task views without having to return and
  pick them up from the view pool.
- This CL also fixes an issue with flashing when the screen turns off.  
  The activity onStop() can be called before the activity is fully 
  hidden, which would trigger a reset(), which would return all views to
  the pool.

Bug: 23815609
Bug: 25411120
Bug: 27186407
Change-Id: I83d74c947f9b47766d6778b7f5c421bb6df833e9
2016-03-04 16:55:25 -08:00
Aga Wronska
16d702dba4 Merge "Changed breadcrumb arrow to match mocks" into nyc-dev
am: f311b01b84

* commit 'f311b01b843434151d04e75c1b50f36447031278':
  Changed breadcrumb arrow to match mocks
2016-03-05 00:33:11 +00:00
Aga Wronska
f311b01b84 Merge "Changed breadcrumb arrow to match mocks" into nyc-dev 2016-03-05 00:29:48 +00:00
Chris Craik
9cbba4e7c7 Merge "Support GPU profiling vis in new pipeline" into nyc-dev
am: b862f5866f

* commit 'b862f5866ffa93107cd11eca38dc98248b445f18':
  Support GPU profiling vis in new pipeline
2016-03-05 00:28:23 +00:00
Svet Ganov
03f2afc3db Don't crash legacy apps with revoked "Draw over apps access"
bug:26396161

Change-Id: I8b86e175b4815e58ace78c37a86141c5e4dbe183
2016-03-04 16:24:17 -08:00
Chris Craik
b862f5866f Merge "Support GPU profiling vis in new pipeline" into nyc-dev 2016-03-05 00:19:10 +00:00
Chris Craik
1dfa070496 Support GPU profiling vis in new pipeline
bug:27353099

Change-Id: I905c1a998d9a9e2097c047dab9de87a70d7a370e
2016-03-04 16:18:26 -08:00
Aga Wronska
4730beb85c Changed breadcrumb arrow to match mocks
Bug: 27136601
Change-Id: I03b3d789c1edf8de7f3d92238045cca123ce5e72
2016-03-04 16:12:38 -08:00
Adam Lesinski
739b9f7b0f Merge "AAPT2: Support building, linking, and merging static libraries" into nyc-dev
am: 8b030cce34

* commit '8b030cce347dbfc5c2f33d96daf1de7eeb219c76':
  AAPT2: Support building, linking, and merging static libraries
2016-03-04 23:51:32 +00:00
Adam Lesinski
8b030cce34 Merge "AAPT2: Support building, linking, and merging static libraries" into nyc-dev 2016-03-04 23:46:49 +00:00
Adrian Roos
8b30c1a579 Merge "Fix BiDi issues in app error dialogs" into nyc-dev
am: d78520192a

* commit 'd78520192a73166c905d8df2ddb272de674045e2':
  Fix BiDi issues in app error dialogs
2016-03-04 23:42:24 +00:00
Adrian Roos
d78520192a Merge "Fix BiDi issues in app error dialogs" into nyc-dev 2016-03-04 23:37:03 +00:00
Jeff Sharkey
d5896630f6 Move more PM calls to ParceledListSlice.
Since the data returned by these calls can grow unbounded based on
various GET flags, we need to switch 'em over.

Bug: 27391893
Change-Id: Ie849ca30dbaaa91158da4c83675657715629a0ee
2016-03-04 16:31:34 -07:00
Adrian Roos
683ad30173 Log bouncer prompt reason
am: 569edb8512

* commit '569edb85125e6754de8f8e60f993afad42eed490':
  Log bouncer prompt reason
2016-03-04 23:20:09 +00:00
Adrian Roos
569edb8512 Log bouncer prompt reason
Bug: 27434873
Change-Id: I6918507b66506cf95b20f95fe4a5cb19c899122f
2016-03-04 15:13:28 -08:00
Jean-Michel Trivi
6bc51e0e5c Merge "API changes for audio recording notifications" into nyc-dev
am: b74926232e

* commit 'b74926232ee601851e08cd5d0f0386afcb0bef3e':
  API changes for audio recording notifications
2016-03-04 22:53:58 +00:00
Jean-Michel Trivi
b74926232e Merge "API changes for audio recording notifications" into nyc-dev 2016-03-04 22:49:31 +00:00
Chris Wren
0eab4edab5 Merge "add more comments from the other file" into nyc-dev
am: b279a8b39c

* commit 'b279a8b39c38e2d4f0db4e91d994ca7815b100b9':
  add more comments from the other file
2016-03-04 22:45:46 +00:00
Chris Wren
b279a8b39c Merge "add more comments from the other file" into nyc-dev 2016-03-04 22:42:03 +00:00
Aga Wronska
9ca0c0564e Merge "Made breadcrumb drop down match mocks" into nyc-dev
am: e5a3bb76b8

* commit 'e5a3bb76b8b50aee73d7a7f23af67fc153564c2a':
  Made breadcrumb drop down match mocks
2016-03-04 22:41:30 +00:00