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

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathieu Chartier
fff5e0a051 am 7fc9176c: Add zygote space to Dalvik Heap 
automerge: 78f235d

* commit '78f235db2dcd09ace3efe785af0ee0bf88bb99a8':
  Add zygote space to Dalvik Heap
 2014-11-20 21:02:47 +00:00
Jason Monk
16b03c9a73 am 2e982258: Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev 
automerge: bdf37b7

* commit 'bdf37b714d4c3e3fb0ac27c625fdcffbd616b4f9':
  SysUI: Refactor the NetworkControllerImpl
 2014-11-20 21:00:19 +00:00
Geoffrey Borggaard
90ed95faed am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev 
* commit 'c3f5d7183a21cb081bab1a6bca3fc115523e4e78':
  Fix null handling in proxies.
 2014-11-20 20:59:00 +00:00
Craig Mautner
9bb16f55e8 am 25418aab: Merge "Ensure arraylist index is montonically decreasing" into lmp-mr1-dev 
* commit '25418aabb687b39a9e5bbe7c387bfcb81bde1222':
  Ensure arraylist index is montonically decreasing
 2014-11-20 20:57:22 +00:00
Geoffrey Borggaard
c3f5d7183a Merge "Fix null handling in proxies." into lmp-dev 2014-11-20 20:55:26 +00:00
Craig Mautner
25418aabb6 Merge "Ensure arraylist index is montonically decreasing" into lmp-mr1-dev 2014-11-20 20:53:36 +00:00
Jean-Michel Trivi
8dc1031453 Convert record channel mask for dynamic mix 
When creating the AudioRecord instance for a dynamic mix, convert
  the output channel mask of the mix to an input channel mask
  to be used by the AudioRecord instance through which the
  mixed audio is rerouted.

Bug 16009464

Change-Id: I3addbe85339f6f06b69acc3f9b8e2a765e5d7305
 2014-11-20 12:53:23 -08:00
Adrian Roos
481a6df99f Add device locked API for TrustAgentService 
Bug: 18414067
Change-Id: I96c68af9ccc9940acf9fab3b5bd39a3485f01045
 2014-11-20 21:48:38 +01:00
Christopher Tate
ac6a3a5e9d Recents backup helper 
Handles backup/restore of recent tasks for the system.  Currently the
thumbnails are not saved.

At restore time the historical task records are placed in a designated
separate location rather than directly in the live bookkeeping; this
avoids ID duplication issues and makes it easier to deal with lazy
adoption of the historical task state as apps are installed on the
device post-restore.

Bug 17303286
Bug 15986349

Change-Id: Ie156c1e2ab9c9a7e7ac0447b27016fdcef55dded
 2014-11-20 12:48:25 -08:00
Adrian Roos
50bfeec868 Update KeyguardManager.isDeviceLocked API 
Bug: 18414067
Change-Id: I0715714c2c9a122f578ec0c6f508faae12e6f752
 2014-11-20 21:45:04 +01:00
Eric Rowe
3b442e23d8 am 1d76d397: Merge "Fix wifi reconnection tests." into lmp-mr1-dev 
* commit '1d76d39723c73b14be648a89cb7e6da32b04171c':
  Fix wifi reconnection tests.
 2014-11-20 20:42:53 +00:00
Wink Saville
1caab41f31 am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 
* commit '816e19eb6d5795f98f072494c763b20fe3412c30':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-20 20:38:40 +00:00
Ricardo Cervera
8837ce2ce3 am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class. 
* commit 'e9b5dfc0588010a97a561d3255ad35d10db000bc':
  docs: Fixes to the Data Layer Wear class.
 2014-11-20 20:37:34 +00:00
Ricardo Cervera
161dce465e am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev 
* commit 'c8543b4f4661902371c16932faa109befb921345':
  docs: Fixes to the Data Layer Wear class.
 2014-11-20 20:37:30 +00:00
Jorim Jaggi
d05064b850 Tint SIM images in PIN/PUK screen 
Bug: 18147652
Change-Id: Ic077a80883782c228dce0d4537e4c7e5e3caf2b4
 2014-11-20 21:36:52 +01:00
Jim Miller
52a6133f4b Add multi-sim support to keyguard 
Use new telephony APIs.
Clean up SIM state machine code.
Use cached copy of SubscriptionInfo.
Make SIM PIN and SIM PUK work.

Tested on single and multi-SIM devices.

Fixes bug 18147652

Change-Id: Ic69a4d2898999a5438e6a70b5851705bc05443f1
 2014-11-20 21:36:52 +01:00
Eric Rowe
1d76d39723 Merge "Fix wifi reconnection tests." into lmp-mr1-dev 2014-11-20 20:36:44 +00:00
Eric Rowe
ef1a177e6c Fix wifi reconnection tests. 
Bug: 18417638
Change-Id: I1710e8b16d4ae1b32317deb0322a98ad45b4e1aa
 2014-11-20 12:32:58 -08:00
Wink Saville
816e19eb6d Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 2014-11-20 20:31:49 +00:00
Wink Saville
2d1ee98227 Revert "Additional changes to SubscriptionManager API as per API council." 
This reverts commit baf21da1e1.

Change-Id: I73cbdfadf07ca3cf20b042781b62aafcc72b17d6
 2014-11-20 20:29:51 +00:00
Wink Saville
68c21d6736 am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit '4a57e908177c86819ade1ebb813677698f1a526a':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-20 20:23:17 +00:00
Craig Mautner
8d1ab6f200 am 37983832: Merge "Use package name as custom resolver process name" into lmp-mr1-dev 
* commit '37983832081cd5e825ad2e4151332d0d2fed1533':
  Use package name as custom resolver process name
 2014-11-20 20:23:13 +00:00
Wink Saville
4a57e90817 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-20 20:20:02 +00:00
Craig Mautner
3798383208 Merge "Use package name as custom resolver process name" into lmp-mr1-dev 2014-11-20 20:19:04 +00:00
Adam Lesinski
b7ce6d6db1 am 825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev 
* commit '825e0da22a672ada95da2175bb2d48579bf88a0d':
  Fix race when cleaning up receivers/services in Context
 2014-11-20 20:18:51 +00:00
Eric Rowe
d2fd1bd9d6 am 79de0066: Merge "Fix wifi tethering tests." into lmp-mr1-dev 
* commit '79de00662be774328f4b3598c6effbf49474cc0b':
  Fix wifi tethering tests.
 2014-11-20 20:18:46 +00:00
Adam Lesinski
825e0da22a Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev 2014-11-20 20:13:54 +00:00
Craig Mautner
7b4655dbbe Ensure arraylist index is montonically decreasing 
A previous fix for IndexOutOfBoundsException (ag/584621) left a
situation where the index would not decrement if the arraylist
size didn't change. The size doesn't change if the window being
removed is animating away. That caused window manager to remain
in an infinite loop within removeAllWindows.

This change ensures that the index diminishes each pass through
the loop and doesn't exceed the bounds of the arraylist.

Fixes bug 18362246.

Change-Id: Ibca70d95622f3b152ede14857f0e913099dc7b88
 2014-11-20 12:13:22 -08:00
Eric Rowe
79de00662b Merge "Fix wifi tethering tests." into lmp-mr1-dev 2014-11-20 20:12:53 +00:00
Adam Lesinski
23d40c40aa Fix race when cleaning up receivers/services in Context 
Bug:18135575
Change-Id: I2c69c8189d9ebd297c8a83fe84658b26cbb0528f
 2014-11-20 12:00:52 -08:00
Ricardo Cervera
e9b5dfc058 am 25bf00bc: docs: Fixes to the Data Layer Wear class. 
* commit '25bf00bceed5b22f8750e68a45beb944a80773a8':
  docs: Fixes to the Data Layer Wear class.
 2014-11-20 19:56:11 +00:00
Ricardo Cervera
25bf00bcee docs: Fixes to the Data Layer Wear class. 
Bug: 17917638
Bug: 17917145
Bug: 17931937
Bug: 17933032
Bug: 16899307

Change-Id: Iee9fd0a44cd40b9860cf242cbdaabac409882a15
(cherry picked from commit eff209d2c4)
 2014-11-20 19:51:25 +00:00
Ricardo Cervera
c8543b4f46 Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev 2014-11-20 19:49:53 +00:00
Geoffrey Borggaard
79adc958e5 Fix null handling in proxies. 
ProxyInfo.getPacFileUrl() can not be null.  It will be equal to
Uri.EMPTY.  Checking for null was causing global proxies to never be
disabled.  Or more accurately, global proxies would be disabled, but
would reappear after a reboot.

ProxyInfo.getExclusionListByString() can be null.  If no
exclusion list was specified, the proxy settings would not be
successfully saved, they would disappear after reboot.

Bug: 18453223
Change-Id: I1c27e5dca5b9664bb7468ea909bff489fa110a07
 2014-11-20 19:48:20 +00:00
Dan Albert
6698749dd4 Add appropriate casts for char16_t. 
C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.

Bug: 18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
 2014-11-20 11:47:40 -08:00
Dan Albert
46d8444631 Fix clang warnings in core/jni. 
There are a few bugs in here too (mostly people expecting + to
concatenate C strings) :(

Change-Id: I0a243c05c4ea8b56e84896f37814d0fbea4c39d5
 2014-11-20 11:47:00 -08:00
Ruben Brunk
f721ba0463 Camera2: Doc updates for aeExposureCompensation. 
Bug: 18467471

Change-Id: I3c270c535fa5e7f3eb40bd699898a759c07d986b
 2014-11-20 11:46:36 -08:00
Eric Rowe
4902ac4e24 Fix wifi tethering tests. 
Bug: 18418170
Change-Id: Ic3e8b74523c6a8b6003c05258447e9a673541248
 2014-11-20 11:21:54 -08:00
Alan Viverette
a19f057792 am 8ccf071a: Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev 
* commit '8ccf071ab83510c8ef7b4d311d894d5c4a352f6c':
  Move default token handling into WindowManagerImpl
 2014-11-20 19:21:11 +00:00
Alan Viverette
05275a2cbd am 93da37a0: Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev 
* commit '93da37a03b10eaa2971d04e5bbd86b79a154c46a':
  Add padding above and below dialog lists to match Material spec
 2014-11-20 19:21:06 +00:00
Alan Viverette
8ccf071ab8 Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev 2014-11-20 19:16:58 +00:00
Alan Viverette
93da37a03b Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev 2014-11-20 19:16:25 +00:00
Jae Seo
12c03e3386 am f66f3052: Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView." into lmp-mr1-dev 
* commit 'f66f3052a7e99eac436b423280687b84f1ef77d6':
  TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView.
 2014-11-20 19:07:06 +00:00
Jae Seo
f66f3052a7 Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView." into lmp-mr1-dev 2014-11-20 19:03:03 +00:00
Jae Seo
91ab2665ed am 52bfa332: Merge "TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()" into lmp-mr1-dev 
* commit '52bfa3328f076363edb4b5e77f32c8bca2209817':
  TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()
 2014-11-20 18:54:57 +00:00
Jae Seo
89d8fb555a am 7edaf55a: Merge "TIF: fix setSurface() logic" into lmp-mr1-dev 
* commit '7edaf55aab6fb14a640904015e10e2f5c9299423':
  TIF: fix setSurface() logic
 2014-11-20 18:54:52 +00:00
Winson Chung
de04d5573a am 7c122b60: Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev 
* commit '7c122b60b93c9ef4fa428bc142ea61bf4252b70b':
  Use SystemClock time to keep track of last event times. (Bug 17995039)
 2014-11-20 18:54:47 +00:00
Jae Seo
52bfa3328f Merge "TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()" into lmp-mr1-dev 2014-11-20 18:52:16 +00:00
Jae Seo
7edaf55aab Merge "TIF: fix setSurface() logic" into lmp-mr1-dev 2014-11-20 18:51:32 +00:00
Winson Chung
7c122b60b9 Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev 2014-11-20 18:50:50 +00:00